summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Libravatar Junio C Hamano1-0/+12
2008-09-07Merge branch 'jc/maint-checkout-fix'Libravatar Junio C Hamano1-0/+22
2008-09-07wt-status: Teach how to discard changes in the working directoryLibravatar Anders Melchiorsen1-0/+10
2008-09-06git-svn: fix handling of even funkier branch namesLibravatar Eric Wong1-0/+16
2008-09-06builtin-merge: release the lockfile in try_merge_strategy()Libravatar Miklos Vajna1-0/+22
2008-09-06Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano2-89/+93
2008-09-06git-svn: set auto_props when renaming filesLibravatar Paul Talacko1-0/+17
2008-09-06t9124: clean up chdir usageLibravatar Eric Wong1-4/+2
2008-09-06Merge branch 'maint'Libravatar Junio C Hamano1-0/+13
2008-09-05for-each-ref: `:short` format for `refname`Libravatar Bert Wesarg1-0/+44
2008-09-05git-svn: fix 'info' tests for unknown itemsLibravatar Thomas Rast1-48/+25
2008-09-05git svn info: always quote URLs in 'info' outputLibravatar Thomas Rast1-14/+16
2008-09-05git svn info: make info relative to the current directoryLibravatar Thomas Rast1-1/+13
2008-09-05git svn info: tests: fix ptouch argument order in setupLibravatar Thomas Rast1-4/+4
2008-09-05git svn info: tests: use test_cmp instead of git-diffLibravatar Thomas Rast1-22/+22
2008-09-05git svn info: tests: do not use set -eLibravatar Thomas Rast1-2/+0
2008-09-05git svn info: tests: let 'init' test run with SVN 1.5Libravatar Thomas Rast1-2/+2
2008-09-05"blame -c" should be compatible with "annotate"Libravatar Junio C Hamano1-0/+13
2008-09-04Merge branch 'jc/maint-log-grep'Libravatar Junio C Hamano1-0/+51
2008-09-04log --author/--committer: really match only with name partLibravatar Junio C Hamano1-0/+51
2008-09-03Merge branch 'maint'Libravatar Junio C Hamano78-517/+595
2008-09-03Merge branch 'nd/worktree' into maintLibravatar Junio C Hamano1-2/+62
2008-09-03Merge branch 'ho/dashless' into maintLibravatar Junio C Hamano76-515/+515
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi18-99/+99
2008-09-03tests: use "git xyzzy" form (t7000 - t7199)Libravatar Nanako Shiraishi6-183/+183
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Libravatar Nanako Shiraishi26-130/+130
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Libravatar Nanako Shiraishi26-103/+103
2008-09-03clone: fix creation of explicitly named target directoryLibravatar Clemens Buchacher1-0/+18
2008-09-02Merge branch 'tr/filter-branch'Libravatar Junio C Hamano2-2/+99
2008-09-02Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2008-09-02t5300: improve SHA1 collision testLibravatar Nicolas Pitre1-1/+2
2008-09-01Bring local clone's origin URL in line with that of a remote cloneLibravatar Johan Herland1-3/+3
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleLibravatar Junio C Hamano1-46/+54
2008-08-31t6013: replace use of 'tac' with equivalent PerlLibravatar Thomas Rast1-2/+2
2008-08-30diff: Help "less" hide ^M from the outputLibravatar Junio C Hamano1-0/+12
2008-08-30Merge branch 'maint'Libravatar Junio C Hamano2-3/+92
2008-08-30checkout -m: recreate merge when checking out of unmerged indexLibravatar Junio C Hamano1-0/+63
2008-08-30Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Libravatar Junio C Hamano1-0/+70
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-1/+8
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleLibravatar Junio C Hamano1-0/+37
2008-08-30checkout --ours/--theirs: allow checking out one side of a conflicting mergeLibravatar Junio C Hamano1-0/+25
2008-08-30checkout -f: allow ignoring unmerged paths when checking out of the indexLibravatar Junio C Hamano1-0/+23
2008-08-30checkout: do not check out unmerged higher stages randomlyLibravatar Junio C Hamano1-0/+22
2008-08-30git-apply: Loosen "match_beginning" logicLibravatar Junio C Hamano1-3/+12
2008-08-30Merge branch 'sp/missing-thin-base' into maintLibravatar Junio C Hamano1-0/+80
2008-08-29rev-list: fix --reverse interaction with --parentsLibravatar Thomas Rast1-0/+42
2008-08-29Merge branch 'np/verify-pack' into maintLibravatar Junio C Hamano1-0/+6
2008-08-29Merge branch 'maint'Libravatar Junio C Hamano1-0/+6
2008-08-29pretty=format: respect date format optionsLibravatar Jeff King1-0/+6
2008-08-28grep: fix worktree setupLibravatar Nguyễn Thái Ngọc Duy1-0/+5