Merge branch 'nd/clone-local-with-colon'

Jonathan Nieder committed about 13 years ago

Merge branch 'jx/clean-interactive'

Jonathan Nieder committed about 13 years ago

Merge branch 'jk/diff-algo'

Jonathan Nieder committed about 13 years ago

git-prompt.sh: optionally show upstream branch name

Julien Carsique committed about 13 years ago

path-utils test: rename mingw_path function to print_path

Sebastian Schuberth committed about 13 years ago

howto/revert-a-faulty-merge: fix unescaped '^'s

Ramsay Jones committed about 13 years ago

howto/setup-git-server-over-http: fix unescaped '^'s

Ramsay Jones committed about 13 years ago

http: enable keepalive on TCP sockets

Eric Wong committed about 13 years ago

Use simpler relative_path when set_git_dir

Jiang Xin committed about 13 years ago

relative_path should honor dos-drive-prefix

Jiang Xin committed about 13 years ago

test: use unambigous leading path (/foo) for MSYS

Jiang Xin committed about 13 years ago

mv: Fix spurious warning when moving a file in presence of submodules

Jens Lehmann committed about 13 years ago

mergetools/diffmerge: support DiffMerge as a git mergetool

Stefan Saasen committed about 13 years ago

.mailmap: switch to Thomas Rast's personal address

Thomas Rast committed about 13 years ago

git-svn: Warn about changing default for --prefix in Git v2.0

Johan Herland committed about 13 years ago

Documentation/git-svn: Promote the use of --prefix in docs + examples

Johan Herland committed about 13 years ago

status: show commit sha1 in "You are currently cherry-picking" message

Ralf Thielow committed about 13 years ago

status test: add missing && to <<EOF blocks

Jonathan Nieder committed about 13 years ago

cherry-pick: handle "-" after parsing options

Jeff King committed about 13 years ago

git-svn.txt: elaborate on rev_map files

Keshav Kini committed about 13 years ago