Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix
Junio C Hamano committed almost 18 years ago
merge-recursive: do not clobber untracked working tree garbage
Junio C Hamano committed almost 18 years ago
modify/delete conflict resolution overwrites untracked file
Clemens Buchacher committed almost 18 years ago
pager: do not dup2 stderr if it is already redirected
Junio C Hamano committed almost 18 years ago
git-show: do not segfault when showing a bad tag
Junio C Hamano committed almost 18 years ago
Get rid of the last remnants of GIT_CONFIG_LOCAL
Johannes Schindelin committed almost 18 years ago
Documentation: Describe git-gui Tools menu configuration options.
Alexander Gavrilov committed almost 18 years ago
git-fast-import possible memory corruption problem
YONETANI Tomokazu committed almost 18 years ago
pack-objects: don't use too many threads with few objects
Nicolas Pitre committed almost 18 years ago
builtin-commit: remove unused message variable
Markus Heidelberg committed almost 18 years ago
Junio C Hamano committed almost 18 years ago
mergetool: Don't keep temporary merge files unless told to
Charles Bailey committed almost 18 years ago
mergetool: Add prompt to continue after failing to merge a file
Charles Bailey committed almost 18 years ago
git-branch: display sha1 on branch deletion
Brandon Casey committed almost 18 years ago
Jim Meyering committed almost 18 years ago
autodetect number of CPUs by default when using threads
Nicolas Pitre committed almost 18 years ago
Junio C Hamano committed almost 18 years ago
Linus Torvalds committed almost 18 years ago
gitweb: cache $parent_commit info in git_blame()
Jakub Narebski committed almost 18 years ago
Add support for a pdf version of the user manual
Miklos Vajna committed almost 18 years ago