Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0
Junio C Hamano
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui git-gui 0.17.0 * tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui: git-gui 0.17 git-gui: Don't prepend the prefix if value looks like a full path git-gui: Detect full path when parsing arguments git-gui: remove .git/CHERRY_PICK_HEAD after committing git-gui: Fix a loose/lose mistake git-gui: Fix semi-working shortcuts for unstage and revert git-gui: de.po: translate "remote" as "exte…
Pat Thoyts
git-gui 0.17 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Andrew Wong
git-gui: Don't prepend the prefix if value looks like a full path When argument parsing fails to detect a file name, "git-gui" will try to use the previously detected "head" as the file name. We should avoid prepending the prefix if "head" looks like a full path. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Andrew Wong
git-gui: Detect full path when parsing arguments When running "git-gui blame" from a subfolder (which means prefix is non-empty), if we pass a full path as argument, the argument parsing will fail to recognize the argument as a file name, because prefix is prepended to the argument. This patch handles that scenario by adding an additional branch that checks the file name without using the prefix. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.c…
Junio C Hamano
Git 1.8.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0-rc3
Junio C Hamano
Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: vi.po: update from v1.8.0-rc2-4-g42e55 l10n: Update Swedish translation (1964t0f0u)
Junio C Hamano
Sync with 1.7.12.4
Junio C Hamano
Git 1.7.12.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.12.4
Junio C Hamano
Merge branch 'jk/maint-http-half-auth-push' into maint * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result
Junio C Hamano
Merge branch 'rr/git-uri-doc' into maint * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
Junio C Hamano
Merge branch 'bw/cp-a-is-gnuism' into maint * bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism
Junio C Hamano
Merge branch 'nd/doc-ignore' into maint * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
Junio C Hamano
Merge branch 'jc/doc-long-options' into maint * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
Junio C Hamano
Merge branch 'jc/maint-t1450-fsck-order-fix' into maint * jc/maint-t1450-fsck-order-fix: t1450: the order the objects are checked is undefined
Junio C Hamano
Merge branch 'rr/test-use-shell-path-not-shell' into maint * rr/test-use-shell-path-not-shell: test-lib: use $SHELL_PATH, not $SHELL
Junio C Hamano
Merge branch 'rr/test-make-sure-we-have-git' into maint * rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built
Junio C Hamano
Merge branch 'po/maint-docs' into maint * po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth
Junio C Hamano
Merge branch 'jc/ll-merge-binary-ours' into maint * jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver
Junio C Hamano
Merge branch 'db/doc-custom-xmlto' into maint * db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary
Jiang Xin
Merge branch 'master' of https://github.com/nafmo/git-l10n-sv * 'master' of https://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (1964t0f0u)
Jiang Xin
Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update from v1.8.0-rc2-4-g42e55
Tran Ngoc Quan
l10n: vi.po: update from v1.8.0-rc2-4-g42e55 * translate 3 new messages * review quotes Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Thomas Ackermann
Documentation/RelNotes: remove "updated up to this revision" markers These were used to keep track of the last commit a release notes entry was written for, and should have been removed when cutting the final release. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.8.0 We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-http-half-auth-push' Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1) and master (v1.8.0-rc0). * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result
Peter Krefting
l10n: Update Swedish translation (1964t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Jiang Xin
l10n: Update git.pot (3 new, 6 removed messages) This po/git.pot update is generated from v1.8.0-rc2-4-g42e55. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update translation upto cc76011
Tran Ngoc Quan
l10n: vi.po: update translation upto cc76011 * translate all new messages (100%) * review some others Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
  1. Prev
  2. Next