Merge branch 'pb/reflog-dwim'

Junio C Hamano committed about 18 years ago

Merge branch 'jc/add-stop-at-symlink'

Junio C Hamano committed about 18 years ago

Merge branch 'kh/diff-tree'

Junio C Hamano committed about 18 years ago

Merge branch 'mg/count-objects'

Junio C Hamano committed about 18 years ago

Merge branch 'mz/push-verbose'

Junio C Hamano committed about 18 years ago

Merge branch 'jc/index-extended-flags'

Junio C Hamano committed about 18 years ago

Merge branch 'cc/merge-base-many'

Junio C Hamano committed about 18 years ago

Merge branch 'jc/test-deeper'

Junio C Hamano committed about 18 years ago

Merge branch 'js/parallel-test'

Junio C Hamano committed about 18 years ago

git-submodule.sh - Remove trailing / from URL if found

Mark Levedahl committed about 18 years ago

Fix "git-merge -s bogo" help text

Junio C Hamano committed about 18 years ago

revision.h: make show_early_output an extern which is defined in revision.c

Brandon Casey committed about 18 years ago

Update draft release notes for 1.6.1

Junio C Hamano committed about 18 years ago

Merge branch 'maint'

Junio C Hamano committed about 18 years ago

Update draft release notes for 1.6.0.1

Junio C Hamano committed about 18 years ago

Add hints to revert documentation about other ways to undo changes

Tarmigan Casebolt committed about 18 years ago

Install templates with the user and group of the installing personality

Johannes Sixt committed about 18 years ago

"git-merge": allow fast-forwarding in a stat-dirty tree

Junio C Hamano committed about 18 years ago

completion: find out supported merge strategies correctly

Junio C Hamano committed about 18 years ago

decorate: allow const objects to be decorated

Jeff King committed about 18 years ago