Merge branch 'mp/t7060-diff-index-test'

Junio C Hamano committed about 11 years ago

Merge branch 'gb/apply-comment-typofix'

Junio C Hamano committed about 11 years ago

path: implement common_dir handling in git_pathdup_submodule()

Max Kirillov committed about 11 years ago

submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()

Max Kirillov committed about 11 years ago

gitk: Accelerators for the main menu

Giuseppe Bilotta committed about 11 years ago

gitk: Adjust the menu line numbers to compensate for the new entry

Beat Bolli committed about 11 years ago

Documentation/config: fix formatting for branch.*.rebase and pull.rebase

Andreas Schwab committed about 11 years ago

tag, update-ref: improve description of option "create-reflog"

Ralf Thielow committed about 11 years ago

pull: don't mark values for option "rebase" for translation

Ralf Thielow committed about 11 years ago

Makefile: use SHELL_PATH when running generate-cmdlist.sh

Alejandro R. Sedeño committed about 11 years ago

Documentation/git-rebase: fix --no-autostash formatting

John Keeping committed about 11 years ago

rebase: support --no-autostash

John Keeping committed about 11 years ago

Makefile: allow $(ARFLAGS) specified from the command line

Junio C Hamano committed about 11 years ago

Merge git://bogomips.org/git-svn

Junio C Hamano committed about 11 years ago

git-svn: parse authors file more leniently

Michael J Gruber committed about 11 years ago

Makefile: fix MAKEFLAGS tests with multiple flags

John Keeping committed about 11 years ago

Merge branch 'master' of github.com:jiangxin/git

Jiang Xin committed about 11 years ago

Sync with 2.5.2

Junio C Hamano committed about 11 years ago

am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Johannes Schindelin committed about 11 years ago

l10n: sv.po: Update Swedish translation (2441t0f0u)

Peter Krefting committed about 11 years ago