summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* difftool: print list of valid tools with '--tool-help'th/difftool-diffallTim Henigan2012-03-263-8/+48
* difftool: teach difftool to handle directory diffsTim Henigan2012-03-234-17/+198
* difftool: replace system call with Git::command_noisyTim Henigan2012-03-231-9/+1
* difftool: eliminate setup_environment functionTim Henigan2012-03-231-7/+2
* difftool: stop appending '.exe' to gitTim Henigan2012-03-231-10/+1
* difftool: remove explicit change of PATHTim Henigan2012-03-231-4/+0
* difftool: exit(0) when usage is printedTim Henigan2012-03-231-4/+5
* difftool: add '--no-gui' optionTim Henigan2012-03-232-3/+17
* difftool: parse options using Getopt::LongTim Henigan2012-03-231-65/+46
* Merge branch 'th/mergetools-deltawalker'Junio C Hamano2012-03-161-2/+3
|\
| * Documentation/difftool: add deltawalker to list of valid diff toolsth/mergetools-deltawalkerTim Henigan2012-03-151-2/+3
* | Merge branch 'jc/maint-verify-objects-remove-pessimism'Junio C Hamano2012-03-161-4/+4
|\ \
| * | fetch/receive: remove over-pessimistic connectivity checkjc/maint-verify-objects-remove-pessimismJunio C Hamano2012-03-151-4/+4
* | | Merge branch 'sl/customize-sane-tool-path'Junio C Hamano2012-03-161-0/+17
|\ \ \
| * | | configure: allow user to prevent $PATH "sanitization" on Solarissl/customize-sane-tool-pathStefano Lattarini2012-03-091-0/+17
* | | | Merge "two fixes for fast-import's 'ls' command" from JonathanJunio C Hamano2012-03-162-0/+43
|\ \ \ \
| * | | | fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-092-0/+41
| * | | | fast-import: leakfix for 'ls' of dirty treesJonathan Nieder2012-03-091-0/+2
* | | | | Merge branch 'th/git-diffall'Junio C Hamano2012-03-151-28/+24
|\ \ \ \ \
| * | | | | contrib/diffall: fix cleanup trap on Windowsth/git-diffallTim Henigan2012-03-141-4/+3
| * | | | | contrib/diffall: eliminate duplicate while loopsTim Henigan2012-03-141-15/+9
| * | | | | contrib/diffall: eliminate use of tarTim Henigan2012-03-141-4/+8
| * | | | | contrib/diffall: create tmp dirs without mktempTim Henigan2012-03-141-7/+4
| * | | | | contrib/diffall: comment actual reason for 'cdup'Tim Henigan2012-03-141-1/+3
* | | | | | Merge branch 'th/doc-diff-submodule-option'Junio C Hamano2012-03-151-5/+6
|\ \ \ \ \ \
| * | | | | | Documentation/diff-options: reword description of --submodule optionth/doc-diff-submodule-optionTim Henigan2012-03-141-5/+6
* | | | | | | Git 1.7.10-rc1v1.7.10-rc1Junio C Hamano2012-03-142-4/+12
* | | | | | | Merge branch 'jc/i18n-shell-script-gettext'Junio C Hamano2012-03-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | i18n: fix auto detection of gettext scheme for shell scriptsjc/i18n-shell-script-gettextJunio C Hamano2012-03-121-1/+1
* | | | | | | | Merge branch 'jc/maint-undefined-i18n-observation-test'Junio C Hamano2012-03-131-14/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | t0204: clarify the "observe undefined behaviour" testjc/maint-undefined-i18n-observation-testJunio C Hamano2012-03-091-14/+23
* | | | | | | | | Merge branch 'ms/maint-config-error-at-eol-linecount'Junio C Hamano2012-03-132-4/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecountMartin Stenberg2012-03-122-4/+40
* | | | | | | | | | Merge branch 'ph/rerere-doc'Junio C Hamano2012-03-131-7/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rerere: Document 'rerere remaining'ph/rerere-docPhil Hord2012-03-081-7/+12
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | am: officially deprecate -b/--binary optionJunio C Hamano2012-03-132-4/+4
* | | | | | | | | | Update draft release notes to 1.7.10 before -rc1Junio C Hamano2012-03-121-21/+12
* | | | | | | | | | Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-121-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | verify-tag: Parse GPG configuration options.az/verify-tag-use-gpg-configAlex Zepeda2012-03-081-1/+9
* | | | | | | | | | | Sync with 1.7.9.4Junio C Hamano2012-03-122-1/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-124-3/+28
| * | | | | | | | | | | Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-122-23/+36
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-122-86/+111
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintJunio C Hamano2012-03-121-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-122-4/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | git-am: error out when seeing -b/--binaryThomas Rast2012-03-121-1/+3
* | | | | | | | | | | | | | | | Merge https://github.com/git-l10n/git-poJunio C Hamano2012-03-124-358/+4239
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | l10n: Improve zh_CN translation for msg "not something we can merge"Thynson2012-03-091-1/+1
| * | | | | | | | | | | | | | | l10n: Improve zh_CN trans for msg that cannot fast-forwardThynson2012-03-091-1/+1
| * | | | | | | | | | | | | | | l10n: Update zh_CN translation for 1.7.10-rc0Jiang Xin2012-03-081-169/+177