summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy9-13/+93
2009-12-23Git 1.6.6Libravatar Junio C Hamano3-4/+6
2009-12-23git svn: add test for a git svn gc followed by a git svn mkdirsLibravatar Robert Zeh1-0/+40
2009-12-23git svn: branch/tag commands detect username in URLsLibravatar Eric Wong1-1/+2
2009-12-22Merge branch 'maint'Libravatar Junio C Hamano2-3/+23
2009-12-22git svn: lookup new parents correctly from svn:mergeinfoLibravatar Eric Wong1-1/+2
2009-12-22Prevent git blame from segfaulting on a missing author nameLibravatar David Reiss2-3/+23
2009-12-21git-svn: Remove obsolete MAXPARENT checkLibravatar Andrew Myrick1-6/+0
2009-12-21git-svn: detect cherry-picks correctly.Libravatar Sam Vilain2-25/+66
2009-12-21git-svn: exclude already merged tips using one rev-list callLibravatar Sam Vilain1-4/+48
2009-12-21git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesLibravatar Sam Vilain2-10/+4
2009-12-21git-svn: memoize conversion of SVN merge ticket info to git commit rangesLibravatar Sam Vilain1-37/+54
2009-12-21git-svn: expand the svn mergeinfo test suite, highlighting some failuresLibravatar Sam Vilain3-172/+860
2009-12-21update release notes for git svn in 1.6.6Libravatar Eric Wong1-0/+2
2009-12-21git svn: fix --revision when fetching deleted pathsLibravatar Eric Wong1-1/+5
2009-12-20Git 1.6.6-rc4Libravatar Junio C Hamano2-8/+9
2009-12-19Merge branch 'maint'Libravatar Junio C Hamano3-5/+57
2009-12-19rebase -i: abort cleanly if the editor fails to launchLibravatar Björn Gustavsson1-1/+1
2009-12-19t9146: use 'svn_cmd' wrapperLibravatar Eric Wong1-1/+1
2009-12-19git svn: make empty directory creation gc-awareLibravatar Eric Wong2-11/+58
2009-12-17technical-docs: document hash APILibravatar Stephen Boyd1-2/+48
2009-12-17api-strbuf.txt: fix typos and document launch_editor()Libravatar Stephen Boyd1-2/+8
2009-12-16Git 1.6.6-rc3Libravatar Junio C Hamano2-7/+1
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Libravatar Junio C Hamano10-8/+91
2009-12-16Git 1.6.5.7Libravatar Junio C Hamano4-3/+23
2009-12-16worktree: don't segfault with an absolute pathspec without a work treeLibravatar Junio C Hamano2-2/+20
2009-12-16ignore unknown color configurationLibravatar Jeff King4-3/+26
2009-12-15help.autocorrect: do not run a command if the command given is junkLibravatar Johannes Sixt1-2/+5
2009-12-14Illustrate "filter" attribute with an exampleLibravatar Nanako Shiraishi1-0/+19
2009-12-12bash: Support new 'git fetch' optionsLibravatar Björn Gustavsson1-2/+12
2009-12-10Update Release Notes for 1.6.6 to remove old bugfixesLibravatar Junio C Hamano1-16/+0
2009-12-10Sync with 1.6.5.6Libravatar Junio C Hamano7-179/+37
2009-12-10Git 1.6.5.6Libravatar Junio C Hamano4-3/+27
2009-12-10Fix archive format with -- on the command lineLibravatar Junio C Hamano1-6/+10
2009-12-10Remove post-upload-hookLibravatar Junio C Hamano4-172/+2
2009-12-09Git 1.6.6-rc2Libravatar Junio C Hamano2-4/+10
2009-12-09Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano4-13/+37
2009-12-09Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano2-274/+1816
2009-12-09Update draft release notes to 1.6.6 before -rc2Libravatar Junio C Hamano1-21/+18
2009-12-08Merge branch 'maint'Libravatar Junio C Hamano3-16/+58
2009-12-08Merge branch 'mm/maint-merge-ff-error-message-fix' into maintLibravatar Junio C Hamano3-18/+27
2009-12-08Merge branch 'jn/maint-pull-rebase-error-message' into maintLibravatar Junio C Hamano1-15/+33
2009-12-08Merge branch 'jk/maint-add-p-delete-fix' into maintLibravatar Junio C Hamano2-1/+25
2009-12-08Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano1-1/+3
2009-12-08git-svn: set svn.authorsfile earlier when cloningLibravatar Alex Vandiver1-1/+1
2009-12-08git-svn: Set svn.authorsfile to an absolute path when cloningLibravatar Alex Vandiver1-1/+3
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationLibravatar Junio C Hamano2-9/+3
2009-12-07add-interactive: fix deletion of non-empty filesLibravatar Jeff King2-1/+25
2009-12-07git svn: log removals of empty directoriesLibravatar Eric Wong2-1/+11
2009-12-07git svn: Don't create empty directories whose parents were deletedLibravatar Greg Price1-1/+2