summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2010-04-11attr: Fixed debug output for macro expansion.Henrik Grubbström
2010-01-17git_attr(): fix function signatureJunio C Hamano
2010-01-11rerere forget path: forget recorded resolutionJunio C Hamano
2010-01-11rerere: refactor rerere logic to make it independent from I/OJunio C Hamano
2009-12-26rerere: remove silly 1024-byte line limitJunio C Hamano
2009-12-26resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano
2009-12-26resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano
2009-12-26resolve-undo: allow plumbing to clear the informationJunio C Hamano
2009-12-26resolve-undo: basic testsJunio C Hamano
2009-12-26resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano
2009-12-26builtin-merge.c: use standard active_cache macrosJunio C Hamano
2009-12-23Git 1.6.6v1.6.6Junio C Hamano
2009-12-23git svn: add test for a git svn gc followed by a git svn mkdirsRobert Zeh
2009-12-23git svn: branch/tag commands detect username in URLsEric Wong
2009-12-22Merge branch 'maint'Junio C Hamano
2009-12-22git svn: lookup new parents correctly from svn:mergeinfoEric Wong
2009-12-22Prevent git blame from segfaulting on a missing author nameDavid Reiss
2009-12-21git-svn: Remove obsolete MAXPARENT checkAndrew Myrick
2009-12-21git-svn: detect cherry-picks correctly.Sam Vilain
2009-12-21git-svn: exclude already merged tips using one rev-list callSam Vilain
2009-12-21git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesSam Vilain
2009-12-21git-svn: memoize conversion of SVN merge ticket info to git commit rangesSam Vilain
2009-12-21git-svn: expand the svn mergeinfo test suite, highlighting some failuresSam Vilain
2009-12-21update release notes for git svn in 1.6.6Eric Wong
2009-12-21git svn: fix --revision when fetching deleted pathsEric Wong
2009-12-20Git 1.6.6-rc4v1.6.6-rc4Junio C Hamano
2009-12-20Merge branch 'maint'Junio C Hamano
2009-12-20rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson
2009-12-20t9146: use 'svn_cmd' wrapperEric Wong
2009-12-19git svn: make empty directory creation gc-awareEric Wong
2009-12-18technical-docs: document hash APIStephen Boyd
2009-12-18api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd
2009-12-16Git 1.6.6-rc3v1.6.6-rc3Junio C Hamano
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano
2009-12-16Git 1.6.5.7v1.6.5.7Junio C Hamano
2009-12-16worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano
2009-12-16ignore unknown color configurationJeff King
2009-12-16help.autocorrect: do not run a command if the command given is junkJohannes Sixt
2009-12-15Illustrate "filter" attribute with an exampleNanako Shiraishi
2009-12-12bash: Support new 'git fetch' optionsBjörn Gustavsson
2009-12-11Update Release Notes for 1.6.6 to remove old bugfixesJunio C Hamano
2009-12-11Sync with 1.6.5.6Junio C Hamano
2009-12-10Git 1.6.5.6v1.6.5.6Junio C Hamano
2009-12-10Fix archive format with -- on the command lineJunio C Hamano
2009-12-10Remove post-upload-hookJunio C Hamano
2009-12-10Git 1.6.6-rc2v1.6.6-rc2Junio C Hamano
2009-12-09Merge git://repo.or.cz/git-guiJunio C Hamano
2009-12-09Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano
2009-12-09Update draft release notes to 1.6.6 before -rc2Junio C Hamano
2009-12-09Merge branch 'maint'Junio C Hamano