Merge branch 'js/diff-highlight-avoid-sigpipe'

Junio C Hamano committed almost 12 years ago

Documentation/config.txt: fix minor typo

Thomas Quinot committed almost 12 years ago

config.txt: fix typo

Nicolas Dermine committed almost 12 years ago

use args member of struct child_process

René Scharfe committed almost 12 years ago

trailer: use CHILD_PROCESS_INIT in apply_command()

René Scharfe committed almost 12 years ago

trailer: add test with an old style conflict block

Christian Couder committed almost 12 years ago

trailer: reuse ignore_non_trailer() to ignore conflict lines

Christian Couder committed almost 12 years ago

commit: make ignore_non_trailer() non static

Christian Couder committed almost 12 years ago

Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more

Junio C Hamano committed almost 12 years ago

trailer: display a trailer without its trailing newline

Christian Couder committed almost 12 years ago

trailer: ignore comment lines inside the trailers

Christian Couder committed almost 12 years ago

t1410: fix breakage on case-insensitive filesystems

Jeff King committed almost 12 years ago

git-imap-send: use libcurl for implementation

Bernhard Reiter committed almost 12 years ago

git_connect: set ssh shell command in GIT_SSH_COMMAND

Thomas Quinot committed almost 12 years ago

Git 2.2.0-rc1

Junio C Hamano committed almost 12 years ago

Documentation/git-commit: clarify that --only/--include records the working tree contents

Junio C Hamano committed almost 12 years ago

git-gui: fix verbose loading when git path contains spaces.

Pat Thoyts committed almost 12 years ago

git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows

Sebastian Schuberth committed almost 12 years ago

Merge branch 'maint'

Junio C Hamano committed almost 12 years ago

Merge branch 'nd/gitignore-trailing-whitespace'

Junio C Hamano committed almost 12 years ago