summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-0/+264
|\
| * t1512: match the "other" object namesJunio C Hamano2012-07-131-3/+3
| * t1512: ignore whitespaces in wc -l outputJunio C Hamano2012-07-121-1/+1
| * rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-101-0/+9
| * rev-parse: A and B in "rev-parse A..B" refer to committishJunio C Hamano2012-07-101-1/+1
| * reset: the command takes committishJunio C Hamano2012-07-101-1/+1
| * commit-tree: the command wants a tree and commitsJunio C Hamano2012-07-101-2/+2
| * apply: --build-fake-ancestor expects blobsJunio C Hamano2012-07-101-1/+1
| * sha1_name.c: add support for disambiguating other typesJunio C Hamano2012-07-101-1/+1
| * revision.c: the "log" family, except for "show", takes committishJunio C Hamano2012-07-101-1/+1
| * sha1_name.c: introduce get_sha1_committish()Junio C Hamano2012-07-101-1/+1
| * sha1_name.c: many short names can only be committishJunio C Hamano2012-07-101-1/+1
| * sha1_name.c: get_describe_name() by definition groks only commitsJunio C Hamano2012-07-101-0/+255
* | Merge branch 'jc/maint-filter-branch-epoch-date'Junio C Hamano2012-07-222-3/+13
|\ \
| * | t7003: add test to filter a branch with a commit at epochJunio C Hamano2012-07-122-3/+13
* | | Merge branch 'tg/maint-cache-name-compare'Junio C Hamano2012-07-161-0/+39
|\ \ \
| * | | cache_name_compare(): do not truncate while comparing pathsJunio C Hamano2012-07-111-0/+39
* | | | Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano2012-07-161-0/+10
|\ \ \ \
| * | | | commit: fix "--amend --only" with no pathspecJeff King2012-07-101-0/+10
| |/ / /
* | | | Merge branch 'cw/amend-commit-without-message'Junio C Hamano2012-07-161-0/+15
|\ \ \ \
| * | | | Allow edit of empty message with commit --amendChris Webb2012-07-091-0/+15
* | | | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-162-0/+165
|\ \ \ \ \
| * | | | | apply: tests for the --3way optionJunio C Hamano2012-07-101-0/+54
| * | | | | apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-091-0/+25
| * | | | | apply: register conflicted stages to the indexJunio C Hamano2012-07-091-0/+78
| * | | | | apply: accept -3/--3way command line optionJunio C Hamano2012-07-091-0/+8
* | | | | | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-162-5/+31
|\ \ \ \ \ \
| * | | | | | t3404: make test 57 work with dash and othersMichael J Gruber2012-07-061-1/+5
| * | | | | | Add tests for rebase -i --root without --ontoChris Webb2012-06-272-4/+27
* | | | | | | Merge branch 'pw/git-p4-move'Junio C Hamano2012-07-161-8/+8
|\ \ \ \ \ \ \
| * | | | | | | git p4: add support for 'p4 move' in P4SubmitGary Gibbons2012-07-131-8/+8
* | | | | | | | Merge branch 'pw/git-p4-jobs'Junio C Hamano2012-07-143-5/+168
|\ \ \ \ \ \ \ \
| * | | | | | | | git p4: notice Jobs lines in git commit messagesPete Wyckoff2012-07-061-0/+155
| * | | | | | | | git p4 test: refactor marshal_dumpPete Wyckoff2012-07-062-5/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/refactor-diff-stdin'Junio C Hamano2012-07-141-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano2012-06-291-0/+12
* | | | | | | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-141-0/+164
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-091-0/+164
* | | | | | | | | | Merge branch 'tr/maint-show-walk'Junio C Hamano2012-07-141-0/+91
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | show: fix "range implies walking"Junio C Hamano2012-06-191-2/+2
| * | | | | | | | | | Demonstrate git-show is broken with rangesThomas Rast2012-06-191-0/+91
* | | | | | | | | | | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-142-5/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk2012-06-261-4/+28
| * | | | | | | | | | | rebase --root: print usage on too many argsMartin von Zweigbergk2012-06-261-1/+7
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mz/empty-rebase-test'Junio C Hamano2012-07-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add test case for rebase of empty commitMartin von Zweigbergk2012-06-271-0/+8
* | | | | | | | | | | | Merge branch 'pw/git-p4-tests'Junio C Hamano2012-07-099-433/+574
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | git p4 test: fix badp4dir testPete Wyckoff2012-06-281-3/+7
| * | | | | | | | | | | git p4 test: split up big t9800 testPete Wyckoff2012-06-284-397/+506
| * | | | | | | | | | | git p4 test: cleanup_git should make a new $gitPete Wyckoff2012-06-283-2/+3