pull: remove redirection to git-pull.sh

Paul Tan committed over 11 years ago

pull --rebase: error on no merge candidate cases

Paul Tan committed over 11 years ago

pull --rebase: exit early when the working directory is dirty

Paul Tan committed over 11 years ago

pull: configure --rebase via branch.<name>.rebase or pull.rebase

Paul Tan committed over 11 years ago

pull: teach git pull about --rebase

Paul Tan committed over 11 years ago

pull: set reflog message

Paul Tan committed over 11 years ago

pull: implement pulling into an unborn branch

Paul Tan committed over 11 years ago

pull: fast-forward working tree if head is updated

Paul Tan committed over 11 years ago

pull: check if in unresolved merge state

Paul Tan committed over 11 years ago

pull: support pull.ff config

Paul Tan committed over 11 years ago

pull: error on no merge candidates

Paul Tan committed over 11 years ago

pull: pass git-fetch's options to git-fetch

Paul Tan committed over 11 years ago

git-multimail: update to release 1.1.0

Matthieu Moy committed over 11 years ago

test-lib.sh: fix color support when tput needs ~/.terminfo

Richard Hansen committed over 11 years ago

docs: clarify that --encoding can produce invalid sequences

Jeff King committed over 11 years ago

git-checkout.txt: document "git checkout <pathspec>" better

Torsten Bögershausen committed over 11 years ago

Revert "test-lib.sh: do tests for color support after changing HOME"

Richard Hansen committed over 11 years ago

fetch-pack: check for shallow if depth given

Mike Edgar committed over 11 years ago

Eighth batch for 2.5

Junio C Hamano committed over 11 years ago

Sync with 2.4.4

Junio C Hamano committed over 11 years ago