summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun1-0/+8
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-0/+56
2010-01-17Merge branch 'tc/test-locate-httpd'Libravatar Junio C Hamano1-6/+24
2010-01-17Merge branch 'jh/commit-status'Libravatar Junio C Hamano1-0/+109
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Libravatar Junio C Hamano1-0/+57
2010-01-17Merge branch 'tc/clone-v-progress'Libravatar Junio C Hamano1-1/+2
2010-01-17Merge branch 'tc/smart-http-restrict'Libravatar Junio C Hamano5-260/+349
2010-01-17Merge branch 'jk/run-command-use-shell'Libravatar Junio C Hamano3-3/+4
2010-01-17Merge branch 'sr/gfi-options'Libravatar Junio C Hamano1-0/+152
2010-01-16Merge branch 'cc/reset-more'Libravatar Junio C Hamano1-10/+10
2010-01-16Add push --set-upstreamLibravatar Ilari Liusvaara1-0/+69
2010-01-16t7111: fix bad HEAD in tests with unmerged entriesLibravatar Christian Couder1-10/+10
2010-01-15difftool: Update copyright notices to list each year separatelyLibravatar David Aguilar1-1/+1
2010-01-15Test t5560: Fix test when run with dashLibravatar Tarmigan Casebolt1-5/+10
2010-01-15difftool: Use eval to expand '--extcmd' expressionsLibravatar David Aguilar1-0/+13
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'Libravatar David Aguilar1-0/+8
2010-01-15t7800-difftool.sh: Simplify the --extcmd testLibravatar David Aguilar1-8/+5
2010-01-15grep --no-index: allow use of "git grep" outside a git repositoryLibravatar Junio C Hamano1-0/+52
2010-01-14commit: show interesting ident information in summaryLibravatar Jeff King1-1/+5
2010-01-14strbuf_expand: convert "%%" to "%"Libravatar Jeff King1-0/+7
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsLibravatar Michael Haggerty1-0/+36
2010-01-14t3404: Set up more of the test repo in the "setup" stepLibravatar Michael Haggerty1-25/+26
2010-01-14rebase -i: For fixup commands without squashes, do not start editorLibravatar Michael Haggerty1-4/+3
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesLibravatar Michael Haggerty1-2/+2
2010-01-14t3404: Test the commit count in commit messages generated by "rebase -i"Libravatar Michael Haggerty2-3/+12
2010-01-13Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano2-1/+131
2010-01-13Merge branch 'cc/reset-more'Libravatar Junio C Hamano2-0/+296
2010-01-13Merge branch 'nd/sparse'Libravatar Junio C Hamano7-0/+581
2010-01-13t7502: test commit.status, --status and --no-statusLibravatar Junio C Hamano1-0/+109
2010-01-13grep: rip out support for external grepLibravatar Junio C Hamano1-3/+3
2010-01-12Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy2-3/+5
2010-01-12remote-curl: Fix Accept header for smart HTTP connectionsLibravatar Shawn O. Pearce1-1/+1
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandLibravatar Michael Haggerty1-0/+24
2010-01-12lib-rebase: Allow comments and blank lines to be added to the rebase scriptLibravatar Michael Haggerty1-5/+16
2010-01-12lib-rebase: Provide clearer debugging info about what the editor didLibravatar Michael Haggerty1-2/+3
2010-01-11Remove empty directories when checking out a commit with fewer submodulesLibravatar Peter Collingbourne1-0/+9
2010-01-10rerere forget path: forget recorded resolutionLibravatar Junio C Hamano1-0/+25
2010-01-10start_command: detect execvp failures earlyLibravatar Johannes Sixt1-0/+14
2010-01-10Merge branch 'jk/maint-1.6.5-reset-hard'Libravatar Junio C Hamano1-0/+6
2010-01-10Merge branch 'jk/push-to-delete'Libravatar Junio C Hamano1-0/+26
2010-01-10Merge branch 'mm/config-path'Libravatar Junio C Hamano1-0/+28
2010-01-10Merge branch 'bg/maint-remote-update-default'Libravatar Junio C Hamano1-0/+14
2010-01-10Merge branch 'mm/diag-path-in-treeish'Libravatar Junio C Hamano1-0/+69
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Libravatar Junio C Hamano2-20/+20
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-13/+13
2010-01-09Handle relative paths in submodule .git filesLibravatar Brad King1-1/+1
2010-01-09Test update-index for a gitlink to a .git fileLibravatar Brad King1-0/+38
2010-01-09t7111: check that reset options work as described in the tablesLibravatar Christian Couder1-0/+113
2010-01-09transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...Libravatar Tay Ray Chuan1-1/+1