summaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2007-10-21gitk: Fix "can't unset prevlines(...)" Tcl errorPaul Mackerras1-16/+5
2007-10-21Deduce exec_path also from calls to git with a relative pathJohannes Schindelin1-2/+3
2007-10-20git-p4 support for perforce renames.Chris Pettitt1-1/+11
2007-10-20git-p4: When skipping a patch as part of "git-p4 submit" make sure we correct...Simon Hausmann1-0/+4
2007-10-20gitk: Avoid an error when cherry-picking if HEAD has moved onPaul Mackerras1-1/+1
2007-10-20gitk: Check that we are running on at least Tcl/Tk 8.4Paul Mackerras1-0/+7
2007-10-20gitk: Do not pick up file names of "copy from" linesJohannes Sixt1-2/+1
2007-10-20gitk: Add support for OS X mouse wheelJonathan del Strother1-0/+6
2007-10-19Paper bag fix diff invocation in 'git stash show'Shawn O. Pearce1-1/+1
2007-10-19Further 1.5.3.5 fixes described in release notesShawn O. Pearce1-3/+13
2007-10-19Documentation/git-gc: improve description of --autoJeff King1-12/+17
2007-10-19Documentation/git-gc: explain --auto in descriptionJeff King1-1/+2
2007-10-19git-gc: improve wording of --auto notificationJeff King1-3/+3
2007-10-19Avoid invoking diff drivers during git-stashShawn O. Pearce1-3/+3
2007-10-19attr: fix segfault in gitattributes parsing codeSteffen Prohaska2-1/+11
2007-10-19Define NI_MAXSERV if not defined by operating systemPatrick Welche1-0/+4
2007-10-19Ensure we add directories in the correct orderAlex Bennee1-0/+11
2007-10-19Avoid scary errors about tagged trees/blobs during git-fetchLinus Torvalds1-1/+1
2007-10-18Yet more 1.5.3.5 fixes mentioned in release notesShawn O. Pearce1-0/+8
2007-10-18cvsserver: Use exit 1 instead of die when req_Root fails.Brian Gernhardt1-2/+4
2007-10-18git-blame shouldn't crash if run in an unmerged treeLinus Torvalds2-0/+75
2007-10-18Teach core.autocrlf to 'git blame'Marius Storm-Olsen1-0/+1
2007-10-18git-config: print error message if the config file cannot be readGerrit Pape1-1/+4
2007-10-18Add a message explaining that automatic GC is about to startkoreth@midwinter.com1-0/+4
2007-10-18fixing output of non-fast-forward output of post-receive-emailRobert Schiele1-1/+1
2007-10-17gitk: disable colours when calling git logSam Vilain1-1/+1
2007-10-17git-svn: simplify the handling of fatal errorsBenoit Sigoure1-21/+21
2007-10-17git-svn: add git svn proplistBenoit Sigoure2-1/+38
2007-10-17git-svn: add git svn propgetBenoit Sigoure2-0/+80
2007-10-17git-svn: implement git svn create-ignoreBenoit Sigoure2-3/+52
2007-10-17git-svn: add a generic tree traversal to fetch SVN propertiesBenoit Sigoure1-20/+45
2007-10-17gitweb: speed up project listing on large work trees by limiting find depthLuke Lu3-0/+13
2007-10-17Document additional 1.5.3.5 fixes in release notesShawn O. Pearce1-0/+15
2007-10-17git-cvsexportcommit.perl: git-apply no longer needs --binaryMichael Witten1-2/+2
2007-10-17Avoid 'expr index' on Mac OS X as it isn't supportedShawn O. Pearce1-2/+1
2007-10-17filter-branch: update current branch when rewrittenJohannes Schindelin2-1/+18
2007-10-17fix filter-branch documentationJohannes Schindelin1-2/+1
2007-10-17helpful error message when send-pack finds no refs in common.Andrew Clausen1-1/+2
2007-10-17git-svn: use "no warnings 'once'" to disable false-positivesEygene Ryabinkin1-44/+43
2007-10-17Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREEJohannes Schindelin2-1/+21
2007-10-17Correct typos in release notes for 1.5.3.5Shawn O. Pearce1-2/+2
2007-10-16cvsexportcommit: get rid of temporary directoryJohannes Schindelin1-5/+0
2007-10-16git-rebase: document suppression of duplicate commitsJeff King1-1/+24
2007-10-16Documentation/git-tag.txt: Document how to backdate tagsMichael Olson1-0/+21
2007-10-16git-rebase--interactive.sh: Quote arguments to testMichael W. Olson1-1/+1
2007-10-16Whip post 1.5.3.4 maintenance series into shape.Shawn O. Pearce2-1/+26
2007-10-16Minor usage update in setgitperms.perlJosh England1-3/+4
2007-10-16manual: use 'URL' instead of 'url'.Ralf Wildenhues1-4/+4
2007-10-16manual: add some markup.Ralf Wildenhues2-6/+6
2007-10-16manual: Fix example finding commits referencing given content.Ralf Wildenhues1-1/+1