Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS

Jonathan Nieder committed almost 17 years ago

Documentation: reset: add some missing tables

Christian Couder committed almost 17 years ago

Fix bit assignment for CE_CONFLICTED

Junio C Hamano committed almost 17 years ago

Aggressive three-way merge: fix D/F case

Junio C Hamano committed about 17 years ago

traverse_trees(): handle D/F conflict case sanely

Junio C Hamano committed about 17 years ago

more D/F conflict tests

Junio C Hamano committed about 17 years ago

tests: move convenience regexp to match object names to test-lib.sh

Junio C Hamano committed about 17 years ago

Use warning function instead of fprintf(stderr, "Warning: ...").

Thiago Farina committed almost 17 years ago

"reset --merge": fix unmerged case

Junio C Hamano committed almost 17 years ago

reset: use "unpack_trees()" directly instead of "git read-tree"

Stephan Beyer committed almost 17 years ago

git-difftool: Add '--gui' for selecting a GUI tool

David Aguilar committed almost 17 years ago

t7800-difftool: Set a bogus tool for use by tests

David Aguilar committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

stash: mention --patch in usage string.

Matthieu Moy committed almost 17 years ago

run-command: add "use shell" option

Jeff King committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'maint-1.6.0' into maint

Junio C Hamano committed almost 17 years ago

branch: die explicitly why when calling "git branch [-a|-r] branchname".

Matthieu Moy committed almost 17 years ago

fast-import: Document author/committer/tagger name is optional

Shawn O. Pearce committed almost 17 years ago

SubmittingPatches: hints to know the status of a submitted patch.

Matthieu Moy committed almost 17 years ago