Merge branch 'maint'

Junio C Hamano committed almost 16 years ago

rebase -i: clarify in-editor documentation of "exec"

Jonathan Nieder committed almost 16 years ago

tests: sanitize more git environment variables

Jeff King committed almost 16 years ago

Merge branch 'jn/fast-import-empty-tree-removal' into maint

Junio C Hamano committed almost 16 years ago

fast-import: treat filemodify with empty tree as delete

Jonathan Nieder committed almost 16 years ago

git-gui: add Brazilian Portuguese (pt-BR) translation

Alexandre Erwin Ittner committed almost 16 years ago

rebase: give a better error message for bogus branch

Jeff King committed almost 16 years ago

rebase: use explicit "--" with checkout

Jeff King committed almost 16 years ago

git-gui: update russian translation

Alex Riesen committed almost 16 years ago

git-gui: update russian translation

Alex Riesen committed almost 16 years ago

git-gui: spelling fixes in russian translation

Skip committed almost 16 years ago

git-gui: fix russian translation typos

Serge Ziryukin committed almost 16 years ago

Git 1.7.4-rc3

Junio C Hamano committed almost 16 years ago

Merge branch 'as/userdiff-pascal'

Junio C Hamano committed almost 16 years ago

Merge branch 'jn/setup-fixes'

Junio C Hamano committed almost 16 years ago

t1510: fix typo in the comment of a test

Jonathan Nieder committed almost 16 years ago

Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase

Junio C Hamano committed almost 16 years ago

Subject: setup: officially support --work-tree without --git-dir

Jonathan Nieder committed almost 16 years ago

Documentation: do not treat reset --keep as a special case

Jonathan Nieder committed almost 16 years ago

Correctly report corrupted objects

Björn Steinbrink committed almost 16 years ago