summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | grep: rip out support for external grepJunio C Hamano2010-01-131-3/+3
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-202-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-122-3/+5
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2010-01-201-12/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-151-1/+1
| * | | | | | | | | | | | | | | | | | difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-151-0/+13
| * | | | | | | | | | | | | | | | | | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-0/+8
| * | | | | | | | | | | | | | | | | | t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar2010-01-151-8/+5
| * | | | | | | | | | | | | | | | | | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-1/+18
| * | | | | | | | | | | | | | | | | | difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar2010-01-091-9/+0
| * | | | | | | | | | | | | | | | | | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+12
| * | | | | | | | | | | | | | | | | | t7800-difftool: Set a bogus tool for use by testsDavid Aguilar2010-01-031-1/+2
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-202-31/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-141-0/+36
| * | | | | | | | | | | | | | | | | | t3404: Set up more of the test repo in the "setup" stepMichael Haggerty2010-01-141-25/+26
| * | | | | | | | | | | | | | | | | | rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-141-4/+3
| * | | | | | | | | | | | | | | | | | rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-141-2/+2
| * | | | | | | | | | | | | | | | | | t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty2010-01-142-3/+12
* | | | | | | | | | | | | | | | | | | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-201-0/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+73
* | | | | | | | | | | | | | | | | | | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-202-53/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-121-0/+24
| * | | | | | | | | | | | | | | | | | | lib-rebase: Allow comments and blank lines to be added to the rebase scriptMichael Haggerty2010-01-121-5/+16
| * | | | | | | | | | | | | | | | | | | lib-rebase: Provide clearer debugging info about what the editor didMichael Haggerty2010-01-121-2/+3
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-072-3/+34
| * | | | | | | | | | | | | | | | | | t3404: Use test_commit to set up test repositoryMichael Haggerty2009-12-061-46/+20
* | | | | | | | | | | | | | | | | | | Merge branch 'il/push-set-upstream'Junio C Hamano2010-01-201-0/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add push --set-upstreamIlari Liusvaara2010-01-161-0/+69
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-202-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | commit: show interesting ident information in summaryJeff King2010-01-141-1/+5
| * | | | | | | | | | | | | | | | | | | | strbuf_expand: convert "%%" to "%"Jeff King2010-01-141-0/+7
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tr/http-push-ref-status'Junio C Hamano2010-01-201-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...Tay Ray Chuan2010-01-091-1/+1
| * | | | | | | | | | | | | | | | | | | | transport.c::transport_push(): make ref status affect return valueTay Ray Chuan2010-01-091-2/+2
| * | | | | | | | | | | | | | | | | | | | refactor ref status logic for pushingTay Ray Chuan2010-01-091-2/+2
| * | | | | | | | | | | | | | | | | | | | t5541-http-push.sh: add test for unmatched, non-fast-forwarded refsTay Ray Chuan2010-01-091-0/+21
| * | | | | | | | | | | | | | | | | | | | t5541-http-push.sh: add tests for non-fast-forward pushesTay Ray Chuan2010-01-091-0/+23
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bk/fix-relative-gitdir-file'Junio C Hamano2010-01-201-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Handle relative paths in submodule .git filesBrad King2010-01-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | Test update-index for a gitlink to a .git fileBrad King2010-01-091-0/+38
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere'Junio C Hamano2010-01-181-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-0/+15
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2010-01-181-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne2010-01-111-0/+9
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tc/test-locate-httpd'Junio C Hamano2010-01-171-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t/lib-http.sh: Restructure finding of default httpd locationTarmigan Casebolt2010-01-061-6/+24
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/commit-status'Junio C Hamano2010-01-171-0/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t7502: test commit.status, --status and --no-statusJunio C Hamano2010-01-131-0/+109
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2010-01-171-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-061-0/+57