Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'lf/bundle-with-tip-wo-message' | Junio C Hamano | 2013-04-15 | 1 | -0/+10 |
|\ | |||||
| * | bundle: Accept prerequisites without commit messages | Lukas Fleischer | 2013-04-07 | 1 | -0/+10 |
* | | Merge branch 'tr/perl-keep-stderr-open' | Junio C Hamano | 2013-04-15 | 1 | -1/+2 |
|\ \ | |||||
| * | | t9700: do not close STDERR | Thomas Rast | 2013-04-04 | 1 | -1/+2 |
* | | | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 8 | -12/+12 |
|\ \ \ | |||||
| * \ \ | Merge branch 'rr/test-3200-style' into maint | Junio C Hamano | 2013-04-12 | 1 | -253/+267 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint | Junio C Hamano | 2013-04-12 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 8 | -12/+12 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-04-11 | 4 | -17/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | t: make PIPE a standard test prerequisite | Adam Spiers | 2013-04-11 | 4 | -16/+10 |
| * | | | | | t/README: --immediate skips cleanup commands for failed tests | Simon Ruderich | 2013-04-09 | 1 | -1/+4 |
| * | | | | | Sync with 1.8.1.6 | Junio C Hamano | 2013-04-07 | 1 | -0/+27 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1 | Junio C Hamano | 2013-04-07 | 1 | -0/+27 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'jk/peel-ref' into maint | Junio C Hamano | 2013-04-04 | 1 | -0/+9 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'ap/combine-diff-coalesce-lost' | Junio C Hamano | 2013-04-11 | 1 | -0/+129 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | combine-diff: coalesce lost lines optimally | Antoine Pelisse | 2013-03-25 | 1 | -0/+129 |
* | | | | | | | | Merge branch 'sr/log-SG-no-textconv' | Junio C Hamano | 2013-04-11 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diffcore-pickaxe: respect --no-textconv | Simon Ruderich | 2013-04-05 | 1 | -0/+28 |
* | | | | | | | | | Merge branch 'js/rerere-forget-protect-against-NUL' | Junio C Hamano | 2013-04-11 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rerere forget: do not segfault if not all stages are present | Johannes Sixt | 2013-04-04 | 1 | -0/+13 |
| * | | | | | | | | | rerere forget: grok files containing NUL | Johannes Sixt | 2013-04-02 | 1 | -0/+12 |
* | | | | | | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,... | Junio C Hamano | 2013-04-08 | 1 | -3/+9 |
* | | | | | | | | | | Merge branch 'jk/rm-removed-paths' | Junio C Hamano | 2013-04-07 | 1 | -0/+65 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3600: document failure of rm across symbolic links | Jeff King | 2013-04-04 | 1 | -0/+28 |
| * | | | | | | | | | | t3600: test behavior of reverse-d/f conflict | Jeff King | 2013-04-04 | 1 | -0/+12 |
| * | | | | | | | | | | rm: do not complain about d/f conflicts during deletion | Jeff King | 2013-04-04 | 1 | -0/+25 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint | Junio C Hamano | 2013-04-03 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/alias-in-bare' into maint | Junio C Hamano | 2013-04-03 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/rfc2047-one-char-at-a-time' into maint | Junio C Hamano | 2013-04-03 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/empty-archive' into maint | Junio C Hamano | 2013-04-03 | 5 | -12/+108 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/tag-force-no-warn-on-creation' into maint | Junio C Hamano | 2013-04-03 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 | 4 | -73/+193 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'kb/name-hash' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -73/+96 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+64 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+54 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint | Junio C Hamano | 2013-04-01 | 1 | -0/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'rr/tests-dedup-test-config' into maint | Junio C Hamano | 2013-04-01 | 2 | -10/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/document-status-u-tradeoff' into maint | Junio C Hamano | 2013-04-01 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/downcase-u-in-usage' into maint | Junio C Hamano | 2013-04-01 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/triangle' | Junio C Hamano | 2013-04-07 | 1 | -138/+184 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | remote.c: introduce branch.<name>.pushremote | Ramkumar Ramachandra | 2013-04-02 | 1 | -0/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | | remote.c: introduce remote.pushdefault | Ramkumar Ramachandra | 2013-04-02 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | | | | | | | | | t5516 (fetch-push): drop implicit arguments from helper functions | Jeff King | 2013-04-02 | 1 | -137/+145 |
| * | | | | | | | | | | | | | | | | | | | | | | | t5516 (fetch-push): update test description | Ramkumar Ramachandra | 2013-04-02 | 1 | -1/+12 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/status-during-revert' | Junio C Hamano | 2013-04-07 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | status: show commit sha1 in "You are currently reverting" message | Matthieu Moy | 2013-04-02 | 1 | -3/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | status: show 'revert' state and status hint | Matthieu Moy | 2013-04-02 | 1 | -0/+57 |
| |/ / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/set-upstream-error-cases' | Junio C Hamano | 2013-04-07 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |