Merge branch 'il/remote-updates'

Junio C Hamano committed almost 17 years ago

Merge branch 'il/branch-set-upstream'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/maint-limit-note-output'

Junio C Hamano committed almost 17 years ago

Merge branch 'nd/ls-files-sparse-fix'

Junio C Hamano committed almost 17 years ago

Make difftool.prompt fall back to mergetool.prompt

Sebastian Schuberth committed almost 17 years ago

engine.pl: Fix a recent breakage of the buildsystem generator

Ramsay Jones committed almost 17 years ago

ignore duplicated slashes in make_relative_path()

Junio C Hamano committed almost 17 years ago

git-mv: fix moving more than one source to a single destination

Junio C Hamano committed almost 17 years ago

rebase -i: Enclose sed command substitution in quotes

Michael Haggerty committed almost 17 years ago

rebase -i: Avoid non-portable "test X -a Y"

Michael Haggerty committed almost 17 years ago

make "index-pack" a built-in

Linus Torvalds committed almost 17 years ago

make "git pack-redundant" a built-in

Linus Torvalds committed almost 17 years ago

make "git unpack-file" a built-in

Linus Torvalds committed almost 17 years ago

make "mktag" a built-in

Linus Torvalds committed almost 17 years ago

make "merge-index" a built-in

Linus Torvalds committed almost 17 years ago

merge-tree: remove unnecessary call of git_extract_argv0_path

Johannes Sixt committed almost 17 years ago

make "git patch-id" a built-in

Linus Torvalds committed almost 17 years ago

make "git var" a built-in

Linus Torvalds committed almost 17 years ago

fix git-p4 editor invocation

Nicolas Pitre committed almost 17 years ago

Documentation: improve description of --glob=pattern and friends

Thomas Rast committed almost 17 years ago