Merge branch 'jc/gitignore-precedence'

Junio C Hamano committed over 11 years ago

Merge branch 'nd/diff-i-t-a'

Junio C Hamano committed over 11 years ago

progress: treat "no terminal" as being in the foreground

Jeff King committed over 11 years ago

pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

René Scharfe committed over 11 years ago

clone: call transport_set_verbosity before anything else on the newly created transport

Mike Hommey committed over 11 years ago

subdirectory tests: code cleanup, uncomment test

Stefan Beller committed over 11 years ago

clean: only lstat files in pathspec

David Turner committed over 11 years ago

Documentation/log: clarify what --raw means

Matthieu Moy committed over 11 years ago

pull: parse pull.ff as a bool or string

Paul Tan committed over 11 years ago

pull: make pull.ff=true override merge.ff

Paul Tan committed over 11 years ago

pull: handle --log=<n>

Paul Tan committed over 11 years ago

t5520: test no merge candidates cases

Paul Tan committed over 11 years ago

t5520: prevent field splitting in content comparisons

Paul Tan committed over 11 years ago

sha1_file: pass empty buffer to index empty file

Jim Hill committed over 11 years ago

pack-protocol.txt: fix insconsistent spelling of "packfile"

Patrick Steinhardt committed over 11 years ago

git-unpack-objects.txt: fix inconsistent spelling of "packfile"

Patrick Steinhardt committed over 11 years ago

git-verify-pack.txt: fix inconsistent spelling of "packfile"

Patrick Steinhardt committed over 11 years ago

gitk: Update .po files

Paul Mackerras committed over 11 years ago

gitk: Update Bulgarian translation (304t)

Alexander Shopov committed over 11 years ago

gitk: Use translated version of "Command line" in getcommitlines

Marc Branchaud committed over 11 years ago