summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-014-28/+64
|\
| * mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-254-28/+64
* | Merge branch 'os/commit-submodule-ignore'Junio C Hamano2012-10-011-0/+1
|\ \
| * | commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh2012-09-241-0/+1
* | | Merge branch 'jc/blame-follows-renames'Junio C Hamano2012-10-011-0/+6
|\ \ \
| * | | git blame: document that it always follows origin across whole-file renamesJunio C Hamano2012-09-211-0/+6
* | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher'Junio C Hamano2012-10-012-5/+32
|\ \ \ \
| * | | | receive-pack: drop "n/a" on unpacker errorsJeff King2012-09-212-2/+2
| * | | | receive-pack: send pack-processing stderr over sidebandJeff King2012-09-211-2/+24
| * | | | receive-pack: redirect unpack-objects stdout to /dev/nullJeff King2012-09-211-1/+6
* | | | | Merge branch 'rt/maint-clone-single'Junio C Hamano2012-10-013-18/+218
|\ \ \ \ \
| * | | | | clone --single: limit the fetch refspec to fetched branchRalf Thielow2012-09-203-18/+218
* | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-09-293-1354/+11532
|\ \ \ \ \ \
| * \ \ \ \ \ Merge git://github.com/gotgit/git-po-zh_CNJiang Xin2012-09-281-451/+3954
| |\ \ \ \ \ \
| | * | | | | | l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)Jiang Xin2012-09-151-451/+3954
| * | | | | | | Merge branch 'maint'Jiang Xin2012-09-282-28/+28
| |\ \ \ \ \ \ \
| * | | | | | | | l10n: Fixes to Swedish translationPeter Krefting2012-09-261-5/+6
| * | | | | | | | Update Swedish translation (1967t0f0u)Peter Krefting2012-09-211-473/+3849
| | |/ / / / / / | |/| | | | | |
| * | | | | | | l10n: Update git.pot (825 new, 24 removed messages)Jiang Xin2012-09-151-426/+3724
* | | | | | | | Update draft release notes to 1.8.0Junio C Hamano2012-09-291-46/+54
* | | | | | | | Sync with 1.7.12.2Junio C Hamano2012-09-294-29/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 1.7.12.2v1.7.12.2Junio C Hamano2012-09-293-2/+11
| * | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-09-292-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-296-25/+217
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano2012-09-296-4/+32
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/maint-submodule-unknown-cmd'Junio C Hamano2012-09-293-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra2012-09-253-4/+11
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/archive-zip-utf8'Junio C Hamano2012-09-291-4/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | archive-zip: write extended timestampRené Scharfe2012-09-241-3/+24
| * | | | | | | | | | | | | archive-zip: support UTF-8 pathsRené Scharfe2012-09-181-1/+21
| * | | | | | | | | | | | | Revert "archive-zip: support UTF-8 paths"Junio C Hamano2012-09-181-21/+6
| * | | | | | | | | | | | | archive-zip: support UTF-8 pathsRené Scharfe2012-09-041-6/+21
* | | | | | | | | | | | | | Merge branch 'jk/smart-http-switch'Junio C Hamano2012-09-292-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote-curl: let users turn off smart httpJeff King2012-09-212-1/+14
| * | | | | | | | | | | | | | remote-curl: rename is_http variableJeff King2012-09-201-3/+3
* | | | | | | | | | | | | | | Merge branch 'sp/maint-http-enable-gzip'Junio C Hamano2012-09-293-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Enable info/refs gzip decompression in HTTP clientShawn O. Pearce2012-09-203-3/+5
* | | | | | | | | | | | | | | | Merge branch 'sp/maint-http-info-refs-no-retry'Junio C Hamano2012-09-291-16/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "retry request without query when info/refs?query fails"Shawn O. Pearce2012-09-201-16/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-294-16/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt2012-09-191-2/+3
| * | | | | | | | | | | | | | | rebase -i: Add tests for "--edit-todo"Andrew Wong2012-09-171-0/+18
| * | | | | | | | | | | | | | | rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-173-3/+32
| * | | | | | | | | | | | | | | rebase -i: Refactor help messages for todo fileAndrew Wong2012-09-171-11/+20
| * | | | | | | | | | | | | | | rebase usage: subcommands can not be combined with -iMartin von Zweigbergk2012-09-171-1/+1