Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/mergetool-custom' | Junio C Hamano | 2012-10-01 | 4 | -28/+64 |
|\ | |||||
| * | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 2012-09-25 | 4 | -28/+64 |
* | | Merge branch 'os/commit-submodule-ignore' | Junio C Hamano | 2012-10-01 | 1 | -0/+1 |
|\ \ | |||||
| * | | commit: pay attention to submodule.$name.ignore in .gitmodules | Orgad Shaneh | 2012-09-24 | 1 | -0/+1 |
* | | | Merge branch 'jc/blame-follows-renames' | Junio C Hamano | 2012-10-01 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | git blame: document that it always follows origin across whole-file renames | Junio C Hamano | 2012-09-21 | 1 | -0/+6 |
* | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' | Junio C Hamano | 2012-10-01 | 2 | -5/+32 |
|\ \ \ \ | |||||
| * | | | | receive-pack: drop "n/a" on unpacker errors | Jeff King | 2012-09-21 | 2 | -2/+2 |
| * | | | | receive-pack: send pack-processing stderr over sideband | Jeff King | 2012-09-21 | 1 | -2/+24 |
| * | | | | receive-pack: redirect unpack-objects stdout to /dev/null | Jeff King | 2012-09-21 | 1 | -1/+6 |
* | | | | | Merge branch 'rt/maint-clone-single' | Junio C Hamano | 2012-10-01 | 3 | -18/+218 |
|\ \ \ \ \ | |||||
| * | | | | | clone --single: limit the fetch refspec to fetched branch | Ralf Thielow | 2012-09-20 | 3 | -18/+218 |
* | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-09-29 | 3 | -1354/+11532 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge git://github.com/gotgit/git-po-zh_CN | Jiang Xin | 2012-09-28 | 1 | -451/+3954 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | l10n: zh.CN.po: msgmerge git.pot (1142t195f630u) | Jiang Xin | 2012-09-15 | 1 | -451/+3954 |
| * | | | | | | | Merge branch 'maint' | Jiang Xin | 2012-09-28 | 2 | -28/+28 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | l10n: Fixes to Swedish translation | Peter Krefting | 2012-09-26 | 1 | -5/+6 |
| * | | | | | | | | Update Swedish translation (1967t0f0u) | Peter Krefting | 2012-09-21 | 1 | -473/+3849 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | l10n: Update git.pot (825 new, 24 removed messages) | Jiang Xin | 2012-09-15 | 1 | -426/+3724 |
* | | | | | | | | Update draft release notes to 1.8.0 | Junio C Hamano | 2012-09-29 | 1 | -46/+54 |
* | | | | | | | | Sync with 1.7.12.2 | Junio C Hamano | 2012-09-29 | 4 | -29/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 1.7.12.2v1.7.12.2 | Junio C Hamano | 2012-09-29 | 3 | -2/+11 |
| * | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2012-09-29 | 2 | -28/+28 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maint | Jiang Xin | 2012-09-28 | 1 | -23/+23 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | l10n: Improve many translation for zh_CN | Thynson | 2012-08-07 | 1 | -17/+17 |
| | | * | | | | | | | l10n: Unify the translation for '(un)expected' | Thynson | 2012-08-07 | 1 | -7/+7 |
| | * | | | | | | | | Merge branch 'maint' of https://github.com/ralfth/git-po-de into maint | Jiang Xin | 2012-09-28 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | l10n: de.po: correct translation of a 'rebase' message | Ralf Thielow | 2012-09-27 | 1 | -5/+5 |
| * | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match-1' into maint | Junio C Hamano | 2012-09-29 | 6 | -25/+217 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-mailinfo-mime-attr' into maint | Junio C Hamano | 2012-09-29 | 6 | -4/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/maint-submodule-unknown-cmd' | Junio C Hamano | 2012-09-29 | 3 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule: if $command was not matched, don't parse other args | Ramkumar Ramachandra | 2012-09-25 | 3 | -4/+11 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'rs/archive-zip-utf8' | Junio C Hamano | 2012-09-29 | 1 | -4/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | archive-zip: write extended timestamp | René Scharfe | 2012-09-24 | 1 | -3/+24 |
| * | | | | | | | | | | | | | archive-zip: support UTF-8 paths | René Scharfe | 2012-09-18 | 1 | -1/+21 |
| * | | | | | | | | | | | | | Revert "archive-zip: support UTF-8 paths" | Junio C Hamano | 2012-09-18 | 1 | -21/+6 |
| * | | | | | | | | | | | | | archive-zip: support UTF-8 paths | René Scharfe | 2012-09-04 | 1 | -6/+21 |
* | | | | | | | | | | | | | | Merge branch 'jk/smart-http-switch' | Junio C Hamano | 2012-09-29 | 2 | -4/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | remote-curl: let users turn off smart http | Jeff King | 2012-09-21 | 2 | -1/+14 |
| * | | | | | | | | | | | | | | remote-curl: rename is_http variable | Jeff King | 2012-09-20 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | Merge branch 'sp/maint-http-enable-gzip' | Junio C Hamano | 2012-09-29 | 3 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Enable info/refs gzip decompression in HTTP client | Shawn O. Pearce | 2012-09-20 | 3 | -3/+5 |
* | | | | | | | | | | | | | | | | Merge branch 'sp/maint-http-info-refs-no-retry' | Junio C Hamano | 2012-09-29 | 1 | -16/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Revert "retry request without query when info/refs?query fails" | Shawn O. Pearce | 2012-09-20 | 1 | -16/+2 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'aw/rebase-i-edit-todo' | Junio C Hamano | 2012-09-29 | 4 | -16/+73 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | rebase -i: suggest using --edit-todo to fix an unknown instruction | Johannes Sixt | 2012-09-19 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | rebase -i: Add tests for "--edit-todo" | Andrew Wong | 2012-09-17 | 1 | -0/+18 |
| * | | | | | | | | | | | | | | | rebase -i: Teach "--edit-todo" action | Andrew Wong | 2012-09-17 | 3 | -3/+32 |
| * | | | | | | | | | | | | | | | rebase -i: Refactor help messages for todo file | Andrew Wong | 2012-09-17 | 1 | -11/+20 |
| * | | | | | | | | | | | | | | | rebase usage: subcommands can not be combined with -i | Martin von Zweigbergk | 2012-09-17 | 1 | -1/+1 |