Merge branch 'vh/git-svn-doc' into maint

Junio C Hamano committed over 15 years ago

git_open_noatime(): drop unused parameter

Junio C Hamano committed over 15 years ago

sha1_file: typofix

Junio C Hamano committed over 15 years ago

read_sha1_file(): allow selective bypassing of replacement mechanism

Junio C Hamano committed over 15 years ago

inline lookup_replace_object() calls

Junio C Hamano committed over 15 years ago

read_sha1_file(): get rid of read_sha1_file_repl() madness

Junio C Hamano committed over 15 years ago

t6050: make sure we test not just commit replacement

Junio C Hamano committed over 15 years ago

Declare lookup_replace_object() in cache.h, not in commit.h

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Makefile: add xgettext target for *.sh files

Ævar Arnfjörð Bjarmason committed over 15 years ago

git-sh-i18n.sh: add GIT_GETTEXT_POISON support

Ævar Arnfjörð Bjarmason committed over 15 years ago

git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers

Ævar Arnfjörð Bjarmason committed over 15 years ago

git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

Ævar Arnfjörð Bjarmason committed over 15 years ago

add, merge, diff: do not use strcasecmp to compare config variable names

Jonathan Nieder committed over 15 years ago

Submodules: Don't parse .gitmodules when it contains, merge conflicts

Jens Lehmann committed over 15 years ago

test that git status works with merge conflict in, .gitmodules

Heiko Voigt committed over 15 years ago

Bigfile: teach "git add" to send a large file straight to a pack

Junio C Hamano committed over 15 years ago

git-p4: warn if git authorship won't be retained

Luke Diamand committed over 15 years ago

Update draft release notes to 1.7.6

Junio C Hamano committed over 15 years ago

Merge branch 'bf/commit-template-no-cleanup'

Junio C Hamano committed over 15 years ago