summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano2012-06-031-0/+5
|\
| * rebase: report invalid commit correctlyErik Faye-Lund2012-05-301-0/+5
* | Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-011-0/+5
|\ \
| * | grep: support newline separated pattern listRené Scharfe2012-05-201-0/+5
* | | Merge branch 'jk/ident-split-fix' into maintJunio C Hamano2012-06-011-0/+7
|\ \ \
| * | | fix off-by-one error in split_ident_lineJeff King2012-05-221-0/+7
* | | | Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano2012-05-251-0/+34
|\ \ \ \
| * | | | teach add_submodule_odb() to look for alternatesHeiko Voigt2012-05-141-0/+34
* | | | | Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2012-05-251-0/+19
|\ \ \ \ \
| * | | | | diff --no-index: reset temporary buffer lengths on directory iterationBobby Powers2012-05-161-0/+19
| |/ / / /
* | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-241-1/+15
|\ \ \ \ \
| * | | | | status: respect "-b" for porcelain formatJeff King2012-05-081-1/+6
| * | | | | status: fix null termination with "-b"Jeff King2012-05-081-0/+9
* | | | | | Consistently use "superproject" instead of "supermodule"Jens Lehmann2012-05-202-3/+3
* | | | | | t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt2012-05-201-0/+1
* | | | | | Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintJunio C Hamano2012-05-141-4/+57
|\ \ \ \ \ \
| * | | | | | reflog-walk: tell explicit --date=default from not having --date at allJunio C Hamano2012-05-071-4/+4
| * | | | | | reflog-walk: always make HEAD@{0} show indexed selectorsJeff King2012-05-041-0/+8
| * | | | | | log: respect date_mode_explicit with --format:%gdJeff King2012-05-041-1/+1
| * | | | | | t1411: add more selector index/date testsJeff King2012-05-041-0/+45
* | | | | | | Merge branch 'ef/checkout-empty' into maintJunio C Hamano2012-05-141-0/+11
|\ \ \ \ \ \ \
| * | | | | | | checkout: do not corrupt HEAD on empty repoErik Faye-Lund2012-05-081-0/+11
* | | | | | | | Merge branch 'jk/maint-tformat-with-z' into maintJunio C Hamano2012-05-141-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | log-tree: the previous one is still not quite rightJunio C Hamano2012-05-011-0/+16
| * | | | | | | | log-tree: use custom line terminator in line termination modeJan Krüger2012-05-011-0/+12
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'js/checkout-detach-count' into maintJunio C Hamano2012-05-141-5/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout (detached): truncate list of orphaned commits at the new HEADJohannes Sixt2012-05-041-1/+1
| * | | | | | | | t2020-checkout-detach: check for the number of orphaned commitsJohannes Sixt2012-05-041-5/+16
* | | | | | | | | Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-112-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-122-2/+2
* | | | | | | | | | Merge branch 'js/fast-import-test-9300' into maintJunio C Hamano2012-05-111-34/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt2012-04-201-34/+54
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-111-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-111-0/+14
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sl/test-wc-l-line-count' into maintJunio C Hamano2012-05-1119-74/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-1119-74/+65
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2012-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-parse --show-prefix: add in trailing newlineRoss Lagerwall2012-04-101-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/include-userpath' into maintJunio C Hamano2012-05-101-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: expand tildes in include.path variableJeff King2012-04-291-0/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bw/test-fix-grep-gnuism' into maintJunio C Hamano2012-05-101-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9400: fix gnuism in grepJunio C Hamano2012-04-191-2/+2
* | | | | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' into maintJunio C Hamano2012-05-102-0/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variablesJeff King2012-03-302-0/+28
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-push-progress' into maintJunio C Hamano2012-05-101-2/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5541: test more combinations of --progressJeff King2012-05-011-2/+25
* | | | | | | | | | | | Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano2012-05-102-4/+121
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t4052: work around shells unable to set COLUMNS to 1Zbigniew Jędrzejewski-Szmek2012-04-271-2/+4
| * | | | | | | | | | | | Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graphJunio C Hamano2012-04-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | test-lib: skip test with COLUMNS=1 under mkshZbigniew Jędrzejewski-Szmek2012-04-271-0/+1