Merge branch 'jc/better-conflict-resolution'

Shawn O. Pearce committed about 18 years ago

Merge branch 'mg/maint-remote-fix' into maint

Shawn O. Pearce committed about 18 years ago

Add contrib/rerere-train script

Nanako Shiraishi committed about 18 years ago

Clarify commit error message for unmerged files

Rafael Garcia-Suarez committed about 18 years ago

Use strchrnul() instead of strchr() plus manual workaround

Johan Herland committed about 18 years ago

mingw: remove use of _getdrive() from lstat/fstat

Dmitry Potapov committed about 18 years ago

Use remove_path from dir.c instead of own implementation

Alex Riesen committed about 18 years ago

Add remove_path: a function to remove as much as possible of a path

Alex Riesen committed about 18 years ago

git-submodule: Fix "Unable to checkout" for the initial 'update'

Ping Yin committed about 18 years ago

compat/mingw: Support a timeout in the poll emulation if no fds are given

Johannes Sixt committed about 18 years ago

Clarify how the user can satisfy stash's 'dirty state' check.

Stephen Haberman committed about 18 years ago

usage.c: remove unused functions

Nanako Shiraishi committed about 18 years ago

Merge branch 'maint'

Shawn O. Pearce committed about 18 years ago

Cleanup remove_path

Alex Riesen committed about 18 years ago

Remove empty directories in recursive merge

Alex Riesen committed about 18 years ago

Documentation: clarify the details of overriding LESS via core.pager

Chris Frey committed about 18 years ago

git-gui: Show/hide "Sign Off" based on nocommitmsg option

Shawn O. Pearce committed about 18 years ago

Merge branch 'maint'

Shawn O. Pearce committed about 18 years ago

git-gui: Help identify aspell version on Windows too

Gustaf Hendeby committed about 18 years ago

Merge branch 'mv/merge-recursive'

Shawn O. Pearce committed about 18 years ago