summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-173-2/+20
* rerere: prepare for customizable conflict marker lengthJunio C Hamano2010-01-171-10/+44
* conflict-marker-size: new attributeJunio C Hamano2010-01-161-25/+34
* rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano2010-01-161-4/+1
* merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-162-11/+9
* xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-162-8/+18
* xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-166-12/+17
* git_attr(): fix function signatureJunio C Hamano2010-01-169-14/+19
* rerere forget path: forget recorded resolutionJunio C Hamano2010-01-104-0/+161
* rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-101-35/+76
* rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-251-9/+10
* resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-253-1/+20
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-255-0/+77
* resolve-undo: allow plumbing to clear the informationJunio C Hamano2009-12-252-0/+17
* resolve-undo: basic testsJunio C Hamano2009-12-252-1/+130
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-258-1/+160
* builtin-merge.c: use standard active_cache macrosJunio C Hamano2009-12-251-3/+2
* Git 1.6.6v1.6.6Junio C Hamano2009-12-233-4/+6
* git svn: add test for a git svn gc followed by a git svn mkdirsRobert Zeh2009-12-231-0/+40
* git svn: branch/tag commands detect username in URLsEric Wong2009-12-231-1/+2
* Merge branch 'maint'Junio C Hamano2009-12-222-3/+23
|\
| * Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-222-3/+23
* | git svn: lookup new parents correctly from svn:mergeinfoEric Wong2009-12-221-1/+2
* | git-svn: Remove obsolete MAXPARENT checkAndrew Myrick2009-12-211-6/+0
* | git-svn: detect cherry-picks correctly.Sam Vilain2009-12-212-25/+66
* | git-svn: exclude already merged tips using one rev-list callSam Vilain2009-12-211-4/+48
* | git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesSam Vilain2009-12-212-10/+4
* | git-svn: memoize conversion of SVN merge ticket info to git commit rangesSam Vilain2009-12-211-37/+54
* | git-svn: expand the svn mergeinfo test suite, highlighting some failuresSam Vilain2009-12-213-172/+860
* | update release notes for git svn in 1.6.6Eric Wong2009-12-211-0/+2
* | git svn: fix --revision when fetching deleted pathsEric Wong2009-12-211-1/+5
* | Git 1.6.6-rc4v1.6.6-rc4Junio C Hamano2009-12-202-8/+9
* | Merge branch 'maint'Junio C Hamano2009-12-193-5/+57
|\ \ | |/
| * rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson2009-12-191-1/+1
| * technical-docs: document hash APIStephen Boyd2009-12-171-2/+48
| * api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd2009-12-171-2/+8
* | t9146: use 'svn_cmd' wrapperEric Wong2009-12-191-1/+1
* | git svn: make empty directory creation gc-awareEric Wong2009-12-192-11/+58
* | Git 1.6.6-rc3v1.6.6-rc3Junio C Hamano2009-12-162-7/+1
* | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-1610-8/+91
|\ \ | |/
| * Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-164-3/+23
| * worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2009-12-162-2/+20
| * ignore unknown color configurationJeff King2009-12-164-3/+26
| * help.autocorrect: do not run a command if the command given is junkJohannes Sixt2009-12-151-2/+5
| * Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-141-0/+19
* | bash: Support new 'git fetch' optionsBjörn Gustavsson2009-12-121-2/+12
* | Update Release Notes for 1.6.6 to remove old bugfixesJunio C Hamano2009-12-101-16/+0
* | Sync with 1.6.5.6Junio C Hamano2009-12-107-179/+37
|\ \ | |/
| * Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-104-3/+27
| * Fix archive format with -- on the command lineJunio C Hamano2009-12-101-6/+10
View Lorry Controller Status