summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetool: add support for ECMergeSteffen Prohaska2007-10-182-2/+12
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-182-43/+60
* Merge branch 'jc/am-quiet'Shawn O. Pearce2007-10-181-4/+0
|\
| * git-am: fix typo in the previous one.Junio C Hamano2007-10-011-1/+1
| * git-am: make the output quieter.Junio C Hamano2007-09-291-5/+1
* | Merge branch 'maint'Shawn O. Pearce2007-10-186-4/+92
|\ \
| * | Yet more 1.5.3.5 fixes mentioned in release notesShawn O. Pearce2007-10-181-0/+8
| * | cvsserver: Use exit 1 instead of die when req_Root fails.Brian Gernhardt2007-10-181-2/+4
| * | git-blame shouldn't crash if run in an unmerged treeLinus Torvalds2007-10-182-0/+75
| * | git-config: print error message if the config file cannot be readGerrit Pape2007-10-181-1/+4
| * | fixing output of non-fast-forward output of post-receive-emailRobert Schiele2007-10-181-1/+1
* | | Teach core.autocrlf to 'git blame'Marius Storm-Olsen2007-10-181-0/+1
* | | Merge branch 'lt/diff-rename'Shawn O. Pearce2007-10-181-24/+30
|\ \ \
| * | | optimize diffcore-delta by sorting hash entries.Linus Torvalds2007-10-041-24/+30
* | | | Add a message explaining that automatic GC is about to startkoreth@midwinter.com2007-10-181-0/+4
* | | | git-svn: simplify the handling of fatal errorsBenoit Sigoure2007-10-171-21/+21
* | | | git-svn: add git svn proplistBenoit Sigoure2007-10-172-1/+38
* | | | git-svn: add git svn propgetBenoit Sigoure2007-10-172-0/+80
* | | | git-svn: implement git svn create-ignoreBenoit Sigoure2007-10-172-3/+52
* | | | git-svn: add a generic tree traversal to fetch SVN propertiesBenoit Sigoure2007-10-171-20/+45
* | | | gitweb: speed up project listing on large work trees by limiting find depthLuke Lu2007-10-173-0/+13
* | | | Merge branch 'maint'Shawn O. Pearce2007-10-168-9/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Document additional 1.5.3.5 fixes in release notesShawn O. Pearce2007-10-161-0/+15
| * | | Avoid 'expr index' on Mac OS X as it isn't supportedShawn O. Pearce2007-10-161-2/+1
| * | | filter-branch: update current branch when rewrittenJohannes Schindelin2007-10-162-1/+18
| * | | fix filter-branch documentationJohannes Schindelin2007-10-161-2/+1
| * | | helpful error message when send-pack finds no refs in common.Andrew Clausen2007-10-161-1/+2
| * | | Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREEJohannes Schindelin2007-10-162-1/+21
| * | | Correct typos in release notes for 1.5.3.5Shawn O. Pearce2007-10-161-2/+2
* | | | git-cvsexportcommit.perl: git-apply no longer needs --binaryMichael Witten2007-10-161-2/+2
* | | | git-svn: use "no warnings 'once'" to disable false-positivesEygene Ryabinkin2007-10-161-44/+43
* | | | cvsexportcommit: get rid of temporary directoryJohannes Schindelin2007-10-161-5/+0
* | | | git-rebase: document suppression of duplicate commitsJeff King2007-10-161-1/+24
* | | | Documentation/git-tag.txt: Document how to backdate tagsMichael Olson2007-10-161-0/+21
* | | | git-rebase--interactive.sh: Quote arguments to testMichael W. Olson2007-10-161-1/+1
* | | | Merge branch 'maint'Shawn O. Pearce2007-10-1512-38/+82
|\ \ \ \ | |/ / /
| * | | Whip post 1.5.3.4 maintenance series into shape.Shawn O. Pearce2007-10-152-1/+26
| * | | rebase -i: use diff plumbing instead of porcelainJohannes Schindelin2007-10-151-2/+2
| * | | Do not remove distributed configure scriptMathias Megyei2007-10-151-1/+4
| * | | git-archive: document --execMichele Ballabio2007-10-151-1/+6
| * | | git-reflog: document --verboseMichele Ballabio2007-10-151-1/+4
| * | | git-config: handle --file option with relative pathname properlyGerrit Pape2007-10-151-2/+7
| * | | clear_commit_marks(): avoid deep recursionJohannes Schindelin2007-10-151-9/+14
| * | | git add -i: Remove unused variablesJean-Luc Herren2007-10-151-10/+6
| * | | git add -i: Fix parsing of abbreviated hunk headersJean-Luc Herren2007-10-151-6/+5
| * | | git-config: don't silently ignore options after --listFrank Lichtenheld2007-10-151-1/+4
| * | | Clean up "git log" format with DIFF_FORMAT_NO_OUTPUTLinus Torvalds2007-10-153-3/+3
| * | | Fix embarrassing "git log --follow" bugLinus Torvalds2007-10-151-2/+2
| |/ /
* | | Minor usage update in setgitperms.perlJosh England2007-10-151-3/+4
* | | manual: use 'URL' instead of 'url'.Ralf Wildenhues2007-10-151-4/+4