Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ef/maint-rebase-error-message' into maint | Junio C Hamano | 2012-06-03 | 1 | -0/+5 |
|\ | |||||
| * | rebase: report invalid commit correctly | Erik Faye-Lund | 2012-05-30 | 1 | -0/+5 |
* | | Merge branch 'rs/maint-grep-F' into maint | Junio C Hamano | 2012-06-01 | 1 | -0/+5 |
|\ \ | |||||
| * | | grep: support newline separated pattern list | René Scharfe | 2012-05-20 | 1 | -0/+5 |
* | | | Merge branch 'jk/ident-split-fix' into maint | Junio C Hamano | 2012-06-01 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | fix off-by-one error in split_ident_line | Jeff King | 2012-05-22 | 1 | -0/+7 |
* | | | | Merge branch 'hv/submodule-alt-odb' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+34 |
|\ \ \ \ | |||||
| * | | | | teach add_submodule_odb() to look for alternates | Heiko Voigt | 2012-05-14 | 1 | -0/+34 |
* | | | | | Merge branch 'bp/diff-no-index-strbuf-fix' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+19 |
|\ \ \ \ \ | |||||
| * | | | | | diff --no-index: reset temporary buffer lengths on directory iteration | Bobby Powers | 2012-05-16 | 1 | -0/+19 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maint | Junio C Hamano | 2012-05-24 | 1 | -1/+15 |
|\ \ \ \ \ | |||||
| * | | | | | status: respect "-b" for porcelain format | Jeff King | 2012-05-08 | 1 | -1/+6 |
| * | | | | | status: fix null termination with "-b" | Jeff King | 2012-05-08 | 1 | -0/+9 |
* | | | | | | Consistently use "superproject" instead of "supermodule" | Jens Lehmann | 2012-05-20 | 2 | -3/+3 |
* | | | | | | t3404: begin "exchange commits with -p" test with correct preconditions | Johannes Sixt | 2012-05-20 | 1 | -0/+1 |
* | | | | | | Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint | Junio C Hamano | 2012-05-14 | 1 | -4/+57 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reflog-walk: tell explicit --date=default from not having --date at all | Junio C Hamano | 2012-05-07 | 1 | -4/+4 |
| * | | | | | | reflog-walk: always make HEAD@{0} show indexed selectors | Jeff King | 2012-05-04 | 1 | -0/+8 |
| * | | | | | | log: respect date_mode_explicit with --format:%gd | Jeff King | 2012-05-04 | 1 | -1/+1 |
| * | | | | | | t1411: add more selector index/date tests | Jeff King | 2012-05-04 | 1 | -0/+45 |
* | | | | | | | Merge branch 'ef/checkout-empty' into maint | Junio C Hamano | 2012-05-14 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout: do not corrupt HEAD on empty repo | Erik Faye-Lund | 2012-05-08 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'jk/maint-tformat-with-z' into maint | Junio C Hamano | 2012-05-14 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log-tree: the previous one is still not quite right | Junio C Hamano | 2012-05-01 | 1 | -0/+16 |
| * | | | | | | | | log-tree: use custom line terminator in line termination mode | Jan Krüger | 2012-05-01 | 1 | -0/+12 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/checkout-detach-count' into maint | Junio C Hamano | 2012-05-14 | 1 | -5/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout (detached): truncate list of orphaned commits at the new HEAD | Johannes Sixt | 2012-05-04 | 1 | -1/+1 |
| * | | | | | | | | t2020-checkout-detach: check for the number of orphaned commits | Johannes Sixt | 2012-05-04 | 1 | -5/+16 |
* | | | | | | | | | Merge branch 'ct/advise-push-default' into maint | Junio C Hamano | 2012-05-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix httpd tests that broke when non-ff push advice changed | Christopher Tiwald | 2012-04-12 | 2 | -2/+2 |
* | | | | | | | | | | 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 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gc: do not explode objects which will be immediately pruned | Jeff King | 2012-04-11 | 1 | -0/+14 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | 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 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'mm/include-userpath' into maint | Junio C Hamano | 2012-05-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config: expand tildes in include.path variable | Jeff King | 2012-04-29 | 1 | -0/+8 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | 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 | 2 | -0/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variables | Jeff King | 2012-03-30 | 2 | -0/+28 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/maint-push-progress' into maint | Junio C Hamano | 2012-05-10 | 1 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t5541: test more combinations of --progress | Jeff King | 2012-05-01 | 1 | -2/+25 |
* | | | | | | | | | | | | Merge branch 'lp/diffstat-with-graph' into maint | Junio C Hamano | 2012-05-10 | 2 | -4/+121 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | test-lib: skip test with COLUMNS=1 under mksh | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -0/+1 |