Merge branch 'mo/bin-wrappers'

Junio C Hamano committed almost 17 years ago

read-tree --debug-unpack

Junio C Hamano committed about 17 years ago

unpack-trees.c: look ahead in the index

Junio C Hamano committed about 17 years ago

unpack-trees.c: prepare for looking ahead in the index

Junio C Hamano committed almost 17 years ago

rebase -i: teach --onto A...B syntax

Nanako Shiraishi committed almost 17 years ago

rebase: fix --onto A...B parsing and add tests

Nanako Shiraishi committed almost 17 years ago

checkout -m: do not try to fall back to --merge from an unborn branch

Junio C Hamano committed almost 17 years ago

t7002: test for not using external grep on skip-worktree paths

Nguyễn Thái Ngọc Duy committed almost 17 years ago

t7002: set test prerequisite "external-grep" if supported

Nguyễn Thái Ngọc Duy committed almost 17 years ago

git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"

Vitaly _Vi Shukela committed almost 17 years ago

git-gui: Makefile: consolidate .FORCE-* targets

Jonathan Nieder committed almost 17 years ago

rebase -i --autosquash: auto-squash commits

Nanako Shiraishi committed almost 17 years ago

added -p alias for --prefix

Jakub Suder committed almost 17 years ago

checkout -m path: fix recreating conflicts

Junio C Hamano committed almost 17 years ago

.gitattributes: detect 8-space indent in shell scripts

Junio C Hamano committed almost 17 years ago

Makefile: consolidate .FORCE-* targets

Jonathan Nieder committed almost 17 years ago

Makefile: learn to generate listings for targets requiring special flags

Jonathan Nieder committed almost 17 years ago

Makefile: use target-specific variable to pass flags to cc

Jonathan Nieder committed almost 17 years ago

Makefile: regenerate assembler listings when asked

Jonathan Nieder committed almost 17 years ago

Smart-http tests: Test http-backend without curl or a webserver

Tarmigan Casebolt committed almost 17 years ago