summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Libravatar Junio C Hamano2-7/+34
2007-02-25Merge branch 'jc/merge-symlink' into maintLibravatar Junio C Hamano2-2/+2
2007-02-25merge-recursive: fix longstanding bug in merging symlinksLibravatar Junio C Hamano1-1/+1
2007-02-25merge-index: fix longstanding bug in merging symlinksLibravatar Junio C Hamano1-1/+1
2007-02-25Add Release Notes to prepare for 1.5.0.2Libravatar Junio C Hamano2-1/+60
2007-02-25Allow arbitrary number of arguments to git-pack-objectsLibravatar Roland Dreier1-3/+9
2007-02-25rerere: do not deal with symlinks.Libravatar Junio C Hamano1-5/+9
2007-02-25rerere: do not skip two conflicted paths next to each other.Libravatar Junio C Hamano1-1/+1
2007-02-24Merge git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano1-6/+19
2007-02-25Don't modify CREDITS-FILE if it hasn't changed.Libravatar Junio C Hamano1-6/+19
2007-02-24diff-patch: Avoid emitting double-slashes in textual patch.Libravatar Junio C Hamano1-2/+4
2007-02-24Reword git-am 3-way fallback failure message.Libravatar Junio C Hamano1-1/+1
2007-02-24Limit filename for format-patchLibravatar Robin Rosenberg1-7/+21
2007-02-24core.legacyheaders: Use the description used in RelNotes-1.5.0Libravatar Santi BĂ©jar1-4/+11
2007-02-24git-show-ref --verify: Fail if called without a referenceLibravatar Dmitry V. Levin1-2/+4
2007-02-22git-diff: fix combined diffLibravatar Johannes Schindelin1-1/+2
2007-02-22Fix 'git commit -a' in a newly initialized repositoryLibravatar Fredrik Kuivinen1-0/+4
2007-02-21Include git-gui credits file in dist.Libravatar Shawn O. Pearce1-1/+2
2007-02-21Document the new core.bare configuration option.Libravatar Shawn O. Pearce1-0/+12
2007-02-21Merge branch 'master' of git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano6-120/+308
2007-02-21Use gunzip -c over gzcat in import-tars example.Libravatar Michael Loeffler1-3/+6
2007-02-21git-gui: Don't crash in citool mode on initial commit.Libravatar Shawn O. Pearce1-8/+8
2007-02-21git-gui: Remove TODO list.Libravatar Shawn O. Pearce1-44/+0
2007-02-21git-gui: Include browser in our usage message.Libravatar Shawn O. Pearce1-1/+1
2007-02-21git-gui: Change summary of git-gui.Libravatar Shawn O. Pearce1-1/+1
2007-02-21git-gui: Display all authors of git-gui.Libravatar Shawn O. Pearce4-10/+136
2007-02-21git-gui: Use mixed path for docs on Cygwin.Libravatar Shawn O. Pearce1-1/+1
2007-02-20Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.Libravatar Jason Riedy1-21/+16
2007-02-19Obey NO_C99_FORMAT in fast-import.c.Libravatar Jason Riedy1-14/+23
2007-02-19Add a compat/strtoumax.c for Solaris 8.Libravatar Jason Riedy3-0/+28
2007-02-19git-clone: Sync documentation to usage note.Libravatar Christian Schlotter2-3/+3
2007-02-18GIT 1.5.0.1Libravatar Junio C Hamano3-8/+13
2007-02-18Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingLibravatar Fredrik Kuivinen1-6/+6
2007-02-18Read the config in rev-listLibravatar Fredrik Kuivinen1-0/+1
2007-02-18git-gui: Correct crash when saving options in blame mode.Libravatar Shawn O. Pearce1-15/+21
2007-02-17Update draft release notes for 1.5.0.1Libravatar Junio C Hamano1-2/+19
2007-02-17Merge git://git.kernel.org/pub/scm/gitk/gitk into maintLibravatar Junio C Hamano0-0/+0
2007-02-17Convert update-index references in docs to add.Libravatar Shawn O. Pearce9-14/+15
2007-02-17Attempt to improve git-rebase lead-in description.Libravatar Shawn O. Pearce1-8/+14
2007-02-16Do not take mode bits from index after type change.Libravatar Junio C Hamano6-16/+46
2007-02-16git-blame: prevent argument parsing segfaultLibravatar Tommi Kyntola1-0/+3
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Libravatar Junio C Hamano1-6/+9
2007-02-16git-gui: Expose the browser as a subcommand.Libravatar Shawn O. Pearce1-5/+21
2007-02-15pretend-sha1: grave bugfix.Libravatar Junio C Hamano1-1/+3
2007-02-15git-gui: Create new branches from a tag.Libravatar Martin Koegler1-0/+30
2007-02-14GIT-VERSION-FILE: check ./version first.Libravatar Junio C Hamano1-10/+11
2007-02-14sha1_file.c: Round the mmap offset to half the window size.Libravatar Alexandre Julliard1-5/+3
2007-02-15Make gitk save and restore window pane position on Linux and Cygwin.Libravatar Mark Levedahl1-10/+13
2007-02-15Make gitk save and restore the user set window position.Libravatar Mark Levedahl1-5/+6
2007-02-15[PATCH] gitk: Use show-ref instead of ls-remoteLibravatar Junio C Hamano1-2/+2