summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-10-30git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Libravatar Björn Steinbrink1-0/+2
2007-10-30git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Libravatar Björn Steinbrink1-2/+2
2007-10-30Fix --strategy parsing in git-rebase--interactive.shLibravatar Björn Steinbrink1-1/+0
2007-10-30Make merge-recursive honor diff.renamelimitLibravatar Lars Hjemli1-0/+6
2007-10-30cherry-pick/revert: more compact user direction messageLibravatar Nicolas Pitre1-1/+1
2007-10-30core-tutorial: Use new syntax for git-merge.Libravatar Sergei Organov1-4/+4
2007-10-30git-merge: document but discourage the historical syntaxLibravatar Junio C Hamano1-5/+6
2007-10-30Prevent send-pack from segfaulting (backport from 'master')Libravatar Junio C Hamano1-1/+4
2007-10-30Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in exampleLibravatar Michael W. Olson1-1/+1
2007-10-29RelNotes-1.5.3.5: describe recent fixesLibravatar Junio C Hamano1-0/+21
2007-10-29merge-recursive.c: mrtree in merge() is not used before setLibravatar Junio C Hamano1-1/+1
2007-10-29sha1_file.c: avoid gcc signed overflow warningsLibravatar Junio C Hamano1-7/+9
2007-10-29Fix a small memory leak in builtin-addLibravatar Benoit Sigoure1-0/+2
2007-10-28honor the http.sslVerify option in shell scriptsLibravatar Aurelien Bompard2-4/+6
2007-10-26Fix generation of perl/perl.makLibravatar Alex Riesen1-5/+1
2007-10-24git-remote: fix "Use of uninitialized value in string ne"Libravatar Junio C Hamano1-1/+2
2007-10-21Describe more 1.5.3.5 fixes in release notesLibravatar Shawn O. Pearce1-0/+15
2007-10-21Fix diffcore-break total breakageLibravatar Linus Torvalds2-4/+8
2007-10-21Fix directory scanner to correctly ignore files without d_typeLibravatar Linus Torvalds1-14/+38
2007-10-20Merge branch 'maint' of git://repo.or.cz/git-gui into maintLibravatar Shawn O. Pearce4-11/+73
2007-10-20Improve receive-pack error message about funny ref creationLibravatar Joakim Tjernlund1-1/+1
2007-10-20fast-import: Fix argument order to die in file_change_mLibravatar Julian Phillips1-1/+1
2007-10-20git-gui: Don't display CR within console windowsLibravatar Shawn O. Pearce1-1/+1
2007-10-20git-gui: Handle progress bars from newer gitsLibravatar Shawn O. Pearce1-1/+4
2007-10-20git-gui: Correctly report failures from git-write-treeLibravatar Shawn O. Pearce1-1/+1
2007-10-19gitk.txt: Fix markup.Libravatar Ralf Wildenhues1-1/+1
2007-10-19send-pack: respect '+' on wildcard refspecsLibravatar Jeff King2-0/+50
2007-10-19Paper bag fix diff invocation in 'git stash show'Libravatar Shawn O. Pearce1-1/+1
2007-10-19Further 1.5.3.5 fixes described in release notesLibravatar Shawn O. Pearce1-3/+13
2007-10-18Avoid invoking diff drivers during git-stashLibravatar Shawn O. Pearce1-3/+3
2007-10-18attr: fix segfault in gitattributes parsing codeLibravatar Steffen Prohaska2-1/+11
2007-10-18Define NI_MAXSERV if not defined by operating systemLibravatar Patrick Welche1-0/+4
2007-10-18Ensure we add directories in the correct orderLibravatar Alex Bennee1-0/+11
2007-10-18Avoid scary errors about tagged trees/blobs during git-fetchLibravatar Linus Torvalds1-1/+1
2007-10-18Yet more 1.5.3.5 fixes mentioned in release notesLibravatar Shawn O. Pearce1-0/+8
2007-10-18cvsserver: Use exit 1 instead of die when req_Root fails.Libravatar Brian Gernhardt1-2/+4
2007-10-18git-blame shouldn't crash if run in an unmerged treeLibravatar Linus Torvalds2-0/+75
2007-10-18git-config: print error message if the config file cannot be readLibravatar Gerrit Pape1-1/+4
2007-10-18fixing output of non-fast-forward output of post-receive-emailLibravatar Robert Schiele1-1/+1
2007-10-16Document additional 1.5.3.5 fixes in release notesLibravatar Shawn O. Pearce1-0/+15
2007-10-16Avoid 'expr index' on Mac OS X as it isn't supportedLibravatar Shawn O. Pearce1-2/+1
2007-10-16filter-branch: update current branch when rewrittenLibravatar Johannes Schindelin2-1/+18
2007-10-16fix filter-branch documentationLibravatar Johannes Schindelin1-2/+1
2007-10-16helpful error message when send-pack finds no refs in common.Libravatar Andrew Clausen1-1/+2
2007-10-16Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREELibravatar Johannes Schindelin2-1/+21
2007-10-16Correct typos in release notes for 1.5.3.5Libravatar Shawn O. Pearce1-2/+2
2007-10-15Whip post 1.5.3.4 maintenance series into shape.Libravatar Shawn O. Pearce2-1/+26
2007-10-15rebase -i: use diff plumbing instead of porcelainLibravatar Johannes Schindelin1-2/+2
2007-10-15Do not remove distributed configure scriptLibravatar Mathias Megyei1-1/+4
2007-10-15git-archive: document --execLibravatar Michele Ballabio1-1/+6