Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pack-protocol: fix first-want separator in the examples | Carlos Martín Nieto | 2012-05-14 | 1 | -2/+2 |
* | Git 1.7.10.2v1.7.10.2 | Junio C Hamano | 2012-05-11 | 3 | -2/+17 |
* | Merge branch 'jc/diff-algo-cleanup' into maint | Junio C Hamano | 2012-05-11 | 8 | -25/+24 |
|\ | |||||
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup | Junio C Hamano | 2012-02-19 | 8 | -20/+24 |
| * | xdiff: remove XDL_PATCH_* macros | Junio C Hamano | 2012-02-19 | 1 | -5/+0 |
* | | Merge branch 'ct/advise-push-default' into maint | Junio C Hamano | 2012-05-11 | 10 | -13/+99 |
|\ \ | |||||
| * | | Fix httpd tests that broke when non-ff push advice changed | Christopher Tiwald | 2012-04-12 | 2 | -2/+2 |
| * | | clean up struct ref's nonfastforward fieldct/advise-push-default | Jeff King | 2012-03-26 | 2 | -4/+3 |
| * | | push: Provide situational hints for non-fast-forward errors | Christopher Tiwald | 2012-03-19 | 7 | -12/+99 |
* | | | Merge branch 'js/fast-import-test-9300' into maint | Junio C Hamano | 2012-05-11 | 1 | -34/+54 |
|\ \ \ | |||||
| * | | | t9300-fast-import: avoid 'exit' in test_expect_success snippets | Johannes Sixt | 2012-04-20 | 1 | -34/+54 |
* | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint | Junio C Hamano | 2012-05-11 | 7 | -53/+107 |
|\ \ \ \ | |||||
| * | | | | gc: use argv-array for sub-commands | Jeff King | 2012-04-18 | 1 | -45/+33 |
| * | | | | argv-array: add a new "pushl" method | Jeff King | 2012-04-18 | 3 | -0/+17 |
| * | | | | argv-array: refactor empty_argv initialization | Jeff King | 2012-04-18 | 2 | -3/+2 |
| * | | | | gc: do not explode objects which will be immediately pruned | Jeff King | 2012-04-11 | 4 | -11/+61 |
| |/ / / | |||||
* | | | | Merge branch 'ah/maint-grep-double-init' into maint | Junio C Hamano | 2012-05-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | grep.c: remove redundant line of code | Angus Hammond | 2012-05-07 | 1 | -1/+1 |
* | | | | | Merge branch 'fa/maint-config-doc' into maint | Junio C Hamano | 2012-05-11 | 1 | -5/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-config: describe and clarify "--local <file>" option | Florian Achleitner | 2012-05-07 | 1 | -5/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'rs/unpack-trees-leakfix' into maint | Junio C Hamano | 2012-05-11 | 1 | -10/+17 |
|\ \ \ \ \ | |||||
| * | | | | | unpack-trees: plug minor memory leak | René Scharfe | 2012-04-10 | 1 | -9/+16 |
| * | | | | | unpack-trees: don't perform any index operation if we're not merging | René Scharfe | 2012-04-10 | 1 | -1/+1 |
* | | | | | | Merge branch 'sl/test-wc-l-line-count' into maint | Junio C Hamano | 2012-05-11 | 19 | -74/+65 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests: modernise style: more uses of test_line_count | Stefano Lattarini | 2012-04-11 | 19 | -74/+65 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'rl/show-empty-prefix' into maint | Junio C Hamano | 2012-05-11 | 2 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 2 | -1/+3 |
| |/ / / / / | |||||
* | | | | | | document submdule.$name.update=none option for gitmodules | Heiko Voigt | 2012-05-11 | 2 | -6/+6 |
* | | | | | | Update draft release notes to 1.7.10.2 | Junio C Hamano | 2012-05-10 | 1 | -0/+25 |
* | | | | | | Merge branch 'mm/include-userpath' into maint | Junio C Hamano | 2012-05-10 | 3 | -1/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: expand tildes in include.path variable | Jeff King | 2012-04-29 | 3 | -1/+18 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'cc/fix-missing-va-end-in-revert' into maint | Junio C Hamano | 2012-05-10 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | revert: add missing va_end | Christian Couder | 2012-04-21 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'bw/test-fix-grep-gnuism' into maint | Junio C Hamano | 2012-05-10 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9400: fix gnuism in grep | Junio C Hamano | 2012-04-19 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' into maint | Junio C Hamano | 2012-05-10 | 3 | -13/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | http-backend: respect existing GIT_COMMITTER_* variables | Jeff King | 2012-03-30 | 3 | -13/+37 |
* | | | | | | | | Merge branch 'nl/rebase-i-cheat-sheet' into maint | Junio C Hamano | 2012-05-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheet | Junio C Hamano | 2012-03-20 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'bw/submodule-sed-solaris' into maint | Junio C Hamano | 2012-05-10 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Avoid bug in Solaris xpg4/sed as used in submodule | Ben Walton | 2012-04-09 | 1 | -2/+3 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/maint-push-progress' into maint | Junio C Hamano | 2012-05-10 | 3 | -2/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5541: test more combinations of --progress | Jeff King | 2012-05-01 | 1 | -2/+25 |
| * | | | | | | | | | teach send-pack about --[no-]progress | Jeff King | 2012-05-01 | 2 | -2/+13 |
| * | | | | | | | | | send-pack: show progress when isatty(2) | Jeff King | 2012-05-01 | 1 | -0/+3 |
* | | | | | | | | | | Merge branch 'jc/rerere-train' into maint | Junio C Hamano | 2012-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | contrib/rerere-train: use installed git-sh-setup | Junio C Hamano | 2012-04-30 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'lp/diffstat-with-graph' into maint | Junio C Hamano | 2012-05-10 | 5 | -6/+131 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t4052: work around shells unable to set COLUMNS to 1 | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -2/+4 |
| * | | | | | | | | | | | Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph | Junio C Hamano | 2012-04-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ |