Merge early parts from git://ozlabs.org/~paulus/gitk.git

Junio C Hamano committed over 12 years ago

Merge git://repo.or.cz/git-gui

Junio C Hamano committed over 12 years ago

replace: add a --raw mode for --edit

Jeff King committed over 12 years ago

replace: use argv_array in export_object

Jeff King committed over 12 years ago

avoid double close of descriptors handed to run_command

Jeff King committed over 12 years ago

replace: replace spaces with tabs in indentation

Jeff King committed over 12 years ago

move "%G" format test from t7510 to t6006

Jeff King committed over 12 years ago

Sync with maint

Junio C Hamano committed over 12 years ago

Fifth batch for 2.1

Junio C Hamano committed over 12 years ago

Merge branch 'jm/dedup-name-compare'

Junio C Hamano committed over 12 years ago

Merge branch 'ep/avoid-test-a-o'

Junio C Hamano committed over 12 years ago

Merge branch 'tb/unicode-7.0-display-width'

Junio C Hamano committed over 12 years ago

Merge branch 'ye/doc-http-proto'

Junio C Hamano committed over 12 years ago

Merge branch 'rs/blame-refactor'

Junio C Hamano committed over 12 years ago

Merge branch 'pb/trim-trailing-spaces'

Junio C Hamano committed over 12 years ago

Merge branch 'mc/doc-submodule-sync-recurse'

Junio C Hamano committed over 12 years ago

Merge branch 'sp/complete-ext-alias'

Junio C Hamano committed over 12 years ago

Merge branch 'mc/git-p4-prepare-p4-only'

Junio C Hamano committed over 12 years ago

Merge branch 'jk/repack-pack-writebitmaps-config'

Junio C Hamano committed over 12 years ago

Merge branch 'nd/init-restore-env'

Junio C Hamano committed over 12 years ago