summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Libravatar Junio C Hamano2-20/+20
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Libravatar Junio C Hamano2-20/+20
2010-01-18Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Libravatar Junio C Hamano1-1/+5
2010-01-18Fix mis-backport of t7002Libravatar Junio C Hamano1-1/+5
2010-01-18Merge branch 'jc/rerere'Libravatar Junio C Hamano1-0/+15
2010-01-18Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Libravatar Junio C Hamano1-0/+9
2010-01-18Add branch --set-upstreamLibravatar Ilari Liusvaara1-0/+21
2010-01-18builtin-apply.c: fix the --- and +++ header filename consistency checkLibravatar Andreas Gruenbacher1-0/+38
2010-01-18Add git remote set-urlLibravatar Ilari Liusvaara1-1/+215
2010-01-18builtin-apply.c: Skip filenames without enough componentsLibravatar Andreas Gruenbacher1-0/+5
2010-01-17Extend merge-subtree tests to test -Xsubtree=dir.Libravatar Avery Pennarun1-1/+46
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-17git status: Show uncommitted submodule changes too when enabledLibravatar Jens Lehmann2-3/+3
2010-01-16Merge branch 'cc/reset-more'Libravatar Junio C Hamano1-10/+10
2010-01-16Teach diff that modified submodule directory is dirtyLibravatar Junio C Hamano1-1/+83
2010-01-16Show submodules as modified when they contain a dirty work treeLibravatar Jens Lehmann1-15/+68
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-12Introduce <branch>@{upstream} notationLibravatar Johannes Schindelin1-0/+69
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