summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2013-05-16revision.c: make default history consider bottom commitsLibravatar Kevin Bracey1-6/+6
2013-05-16revision.c: don't show all merges for --parentsLibravatar Kevin Bracey1-2/+2
2013-05-16revision.c: discount side branches when computing TREESAMELibravatar Kevin Bracey2-6/+14
2013-05-16simplify-merges: drop merge from irrelevant side branchLibravatar Kevin Bracey1-1/+1
2013-05-16simplify-merges: never remove all TREESAME parentsLibravatar Kevin Bracey1-2/+2
2013-05-16t6012: update test for tweaked full-history traversalLibravatar Junio C Hamano1-6/+23
2013-05-16revision.c: Make --full-history consider more mergesLibravatar Kevin Bracey2-14/+14
2013-05-16t6111: add parents to testsLibravatar Kevin Bracey1-19/+19
2013-05-16t6111: allow checking the parents as wellLibravatar Junio C Hamano1-9/+21
2013-05-16t6111: new TREESAME test setLibravatar Kevin Bracey1-0/+184
2013-05-16t6019: test file dropped in -s ours mergeLibravatar Kevin Bracey1-0/+19
2013-05-16revision.c: treat A...B merge bases as if manually specifiedLibravatar Kevin Bracey1-1/+1
2013-05-13t6019: demonstrate --ancestry-path A...B breakageLibravatar Kevin Bracey1-1/+20
2013-05-11Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano2-1/+149
2013-05-09Sync with v1.8.2.3Libravatar Junio C Hamano1-4/+3
2013-05-09t5004: avoid using tar for checking emptiness of archiveLibravatar René Scharfe1-3/+2
2013-05-09t5004: ignore pax global header fileLibravatar René Scharfe1-1/+1
2013-05-09git-svn: added an --include-path flagLibravatar Paul Walmsley1-0/+149
2013-05-09git-svn: avoid self-referencing mergeinfoLibravatar Michael Contreras1-1/+0
2013-05-06Merge branch 'jk/merge-tree-added-identically'Libravatar Junio C Hamano1-0/+51
2013-05-06merge-tree: handle directory/empty conflict correctlyLibravatar John Keeping1-0/+51
2013-05-05Merge branch 'fc/push-with-export-reporting-result'Libravatar Junio C Hamano1-0/+14
2013-05-05transport-helper: improve push messagesLibravatar Felipe Contreras1-0/+14
2013-05-03Merge branch 'tr/remote-tighten-commandline-parsing' into maintLibravatar Junio C Hamano1-0/+22
2013-05-01Merge branch 'tr/remote-tighten-commandline-parsing'Libravatar Junio C Hamano1-0/+22
2013-05-01Merge branch 'zk/prompt-rebase-step'Libravatar Junio C Hamano1-4/+10
2013-04-28Merge branch 'maint'Libravatar Junio C Hamano1-38/+0
2013-04-28t/Makefile: remove smoke test targetsLibravatar John Keeping1-38/+0
2013-04-28Merge branch 'jk/merge-tree-added-identically'Libravatar Junio C Hamano1-0/+13
2013-04-28merge-tree: fix typo in "both changed identically"Libravatar John Keeping1-0/+13
2013-04-26Merge branch 'th/bisect-skipped-log'Libravatar Junio C Hamano1-0/+20
2013-04-26Merge branch 'ph/rebase-original'Libravatar Junio C Hamano1-0/+7
2013-04-26Sync with 1.8.2.2Libravatar Junio C Hamano3-10/+22
2013-04-26Merge branch 'jk/chopped-ident' into maintLibravatar Junio C Hamano2-4/+43
2013-04-26Merge branch 'rt/commentchar-fmt-merge-msg' into maintLibravatar Junio C Hamano1-0/+18
2013-04-26Merge branch 'rs/empty-archive' into maintLibravatar Junio C Hamano1-1/+1
2013-04-26Merge branch 'pe/pull-rebase-v-q' into maintLibravatar Junio C Hamano1-0/+27
2013-04-26t7409: do not use export X=YLibravatar Torsten Bögershausen1-4/+10
2013-04-26t9501: do not use export X=YLibravatar Torsten Bögershausen1-5/+10
2013-04-26t9020: do not use export X=YLibravatar Torsten Bögershausen1-1/+2
2013-04-25bash-prompt.sh: show where rebase is at when stoppedLibravatar Zoltan Klinger1-4/+10
2013-04-24Merge branch 'jk/remote-helper-with-signed-tags'Libravatar Junio C Hamano2-0/+26
2013-04-24Merge branch 'sr/log-SG-no-textconv' into maintLibravatar Junio C Hamano1-0/+28
2013-04-24Merge branch 'jc/merge-tag-object' into maintLibravatar Junio C Hamano1-32/+68
2013-04-24remote: 'show' and 'prune' can take more than one remoteLibravatar Thomas Rast1-8/+3
2013-04-24remote: check for superfluous arguments in 'git remote add'Libravatar Thomas Rast1-1/+1
2013-04-24remote: add a test for extra arguments, according to docsLibravatar Thomas Rast1-0/+27
2013-04-23rebase: find orig_head unambiguouslyLibravatar Phil Hord1-0/+7
2013-04-23Merge branch 'nd/pretty-formats'Libravatar Junio C Hamano3-10/+185
2013-04-23Merge branch 'kb/status-ignored-optim-2'Libravatar Junio C Hamano3-3/+205