summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.12.2v1.7.12.2Junio C Hamano2012-09-303-2/+11
* Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-09-302-28/+28
|\
| * Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maintJiang Xin2012-09-281-23/+23
| |\
| | * l10n: Improve many translation for zh_CNThynson2012-08-071-17/+17
| | * l10n: Unify the translation for '(un)expected'Thynson2012-08-071-7/+7
| * | Merge branch 'maint' of https://github.com/ralfth/git-po-de into maintJiang Xin2012-09-281-5/+5
| |\ \
| | * | l10n: de.po: correct translation of a 'rebase' messageRalf Thielow2012-09-271-5/+5
* | | | Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano2012-09-306-25/+217
|\ \ \ \
| * | | | grep.c: make two symbols really file-scope static this timeJunio C Hamano2012-09-201-2/+2
| * | | | t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber2012-09-161-0/+20
| * | | | t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber2012-09-161-16/+22
| * | | | t7810-grep: test multiple --author with --all-matchMichael J Gruber2012-09-161-0/+8
| * | | | t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber2012-09-161-0/+16
| * | | | t7810-grep: bring log --grep tests in common formMichael J Gruber2012-09-161-6/+18
| * | | | grep.c: mark private file-scope symbols as staticJunio C Hamano2012-09-162-3/+6
| * | | | log: document use of multiple commit limiting optionsJunio C Hamano2012-09-141-5/+18
| * | | | log --grep/--author: honor --all-match honored for multiple --grep patternsJunio C Hamano2012-09-141-0/+19
| * | | | grep: show --debug output only onceMichael J Gruber2012-09-141-0/+1
| * | | | grep: teach --debug option to dump the parse treeJunio C Hamano2012-09-144-2/+96
* | | | | Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano2012-09-306-4/+32
|\ \ \ \ \
| * | | | | mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-186-4/+32
| |/ / / /
* | | | | Revert "completion: fix shell expansion of items"Jeff King2012-09-251-8/+1
* | | | | Start preparation for 1.7.12.2Junio C Hamano2012-09-242-1/+33
* | | | | Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2012-09-242-17/+74
|\ \ \ \ \
| * | | | | blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2012-09-112-25/+70
| * | | | | blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2012-09-112-4/+16
| |/ / / /
* | | | | Merge branch 'dj/fetch-all-tags' into maintJunio C Hamano2012-09-247-39/+92
|\ \ \ \ \
| * | | | | fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2012-09-072-0/+34
| * | | | | submodule: use argv_array instead of hand-building arraysJens Lehmann2012-09-033-17/+19
| * | | | | fetch: use argv_array instead of hand-building arraysJeff King2012-09-031-22/+25
| * | | | | argv-array: fix bogus cast when freeing arrayJeff King2012-09-031-1/+1
| * | | | | argv-array: add pop functionJeff King2012-09-033-0/+14
* | | | | | Improve the description of GIT_PS1_SHOWUPSTREAMJonathan "Duke" Leto2012-09-241-3/+4
* | | | | | Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano2012-09-211-6/+4
|\ \ \ \ \ \
| * | | | | | Revert diffstat back to EnglishNguyễn Thái Ngọc Duy2012-09-141-6/+4
* | | | | | | Merge branch 'jw/doc-commit-title' into maintJunio C Hamano2012-09-217-22/+31
|\ \ \ \ \ \ \
| * | | | | | | Documentation: describe subject more preciselyJeremy White2012-09-147-22/+31
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'dg/run-command-child-cleanup' into maintJunio C Hamano2012-09-211-6/+7
|\ \ \ \ \ \ \
| * | | | | | | run-command.c: fix broken list iteration in clear_child_for_cleanupDavid Gould2012-09-111-6/+7
* | | | | | | | Merge branch 'jc/mailinfo-RE' into maintJunio C Hamano2012-09-211-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | mailinfo: strip "RE: " prefixJunio C Hamano2012-09-091-1/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sn/ls-remote-get-url-doc' into maintJunio C Hamano2012-09-212-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | ls-remote: document the '--get-url' optionStefan Naewe2012-09-072-1/+6
* | | | | | | | | Merge branch 'nd/log-n-doc' into maintJunio C Hamano2012-09-212-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: move rev-list option -<n> from git-log.txt to rev-list-options.txtNguyễn Thái Ngọc Duy2012-09-062-5/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano2012-09-215-9/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-065-9/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Documentation: Document signature showing optionsStephen Boyd2012-09-202-0/+7
* | | | | | | | | completion: fix shell expansion of itemsFelipe Contreras2012-09-201-1/+8
* | | | | | | | | Git 1.7.12.1v1.7.12.1Junio C Hamano2012-09-183-2/+14