summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-207-370/+166
|\
| * grep --no-index: allow use of "git grep" outside a git repositoryJunio C Hamano2010-01-152-0/+78
| * grep: prepare to run outside of a work treeJunio C Hamano2010-01-152-1/+8
| * grep: rip out pessimization to use fixmatch()Junio C Hamano2010-01-131-8/+1
| * grep: rip out support for external grepJunio C Hamano2010-01-135-324/+8
| * Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookaheadJunio C Hamano2010-01-121-0/+75
| |\
| | * grep: optimize built-in grep by skipping lines that do not hitJunio C Hamano2010-01-121-0/+75
* | | Merge branch 'jc/maint-strbuf-add-fix-doubling'Junio C Hamano2010-01-201-0/+1
|\ \ \
| * | | strbuf_addbuf(): allow passing the same buf to dst and srcJunio C Hamano2010-01-131-0/+1
| |/ /
* | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-209-13/+93
|\ \ \
| * | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-129-13/+93
| |/ /
* | | Merge branch 'da/difftool'Junio C Hamano2010-01-205-27/+118
|\ \ \
| * | | difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-152-2/+2
| * | | difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-152-2/+14
| * | | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-153-8/+24
| * | | t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar2010-01-151-8/+5
| * | | git-diff.txt: Link to git-difftoolDavid Aguilar2010-01-091-0/+4
| * | | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-094-8/+50
| * | | difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar2010-01-092-14/+4
| * | | difftool--helper: Update copyright and remove distracting commentsDavid Aguilar2010-01-091-4/+1
| * | | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-033-1/+33
| * | | t7800-difftool: Set a bogus tool for use by testsDavid Aguilar2010-01-031-1/+2
| |/ /
* | | Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-203-112/+219
|\ \ \
| * | | rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-142-39/+63
| * | | 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-142-31/+57
| * | | rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty2010-01-141-15/+20
| * | | rebase -i: Extract function do_with_authorMichael Haggerty2010-01-141-12/+15
| * | | rebase -i: Handle the author script all in one place in do_nextMichael Haggerty2010-01-141-2/+2
| * | | rebase -i: Extract a function "commit_message"Michael Haggerty2010-01-141-5/+10
| * | | rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty2010-01-141-8/+3
| * | | rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-142-3/+3
| * | | t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty2010-01-142-3/+12
| * | | rebase -i: Introduce a constant AMENDMichael Haggerty2010-01-141-4/+12
| * | | rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty2010-01-141-6/+11
| * | | rebase -i: Document how temporary files are usedMichael Haggerty2010-01-141-7/+34
| * | | rebase -i: Use symbolic constant $MSG consistentlyMichael Haggerty2010-01-141-4/+4
| * | | rebase -i: Use "test -n" instead of "test ! -z"Michael Haggerty2010-01-141-1/+1
| * | | rebase -i: Inline expressionMichael Haggerty2010-01-141-2/+1
| * | | rebase -i: Remove dead codeMichael Haggerty2010-01-141-1/+0
| * | | rebase -i: Make the condition for an "if" more transparentMichael Haggerty2010-01-141-1/+2
* | | | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-203-0/+120
|\ \ \ \
| * | | | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-063-0/+120
* | | | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-204-68/+137
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-122-1/+25
| * | | | 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-074-18/+77
| * | | t3404: Use test_commit to set up test repositoryMichael Haggerty2009-12-061-46/+20
* | | | Merge branch 'il/push-set-upstream'Junio C Hamano2010-01-205-1/+136
|\ \ \ \
View Lorry Controller Status