Merge branch 'bp/mediawiki-credential'

Junio C Hamano committed over 13 years ago

Merge branch 'mh/reflife'

Junio C Hamano committed over 13 years ago

Merge branch 'kb/full-history-compute-treesame-carefully-2'

Junio C Hamano committed over 13 years ago

Merge branch 'rr/remove-contrib-some'

Junio C Hamano committed over 13 years ago

prompt: squelch error output from cat

Ramkumar Ramachandra committed over 13 years ago

handle multibyte characters in name

Fredrik Gustafsson committed over 13 years ago

rebase: finish_rebase() in noop rebase

Ramkumar Ramachandra committed over 13 years ago

rebase: finish_rebase() in fast-forward rebase

Ramkumar Ramachandra committed over 13 years ago

rebase: guard against missing files in read_basic_state()

Ramkumar Ramachandra committed over 13 years ago

use logical OR (||) instead of binary OR (|) in logical context

René Scharfe committed over 13 years ago

match-trees: factor out fill_tree_desc_strict

René Scharfe committed over 13 years ago

rm: introduce advice.rmHints to shorten messages

Mathieu Lienard--Mayor committed over 13 years ago

rm: better error message on failure for multiple files

Mathieu Lienard--Mayor committed over 13 years ago

add--interactive: respect diff.algorithm

John Keeping committed over 13 years ago

Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist

Slava Kardakov committed over 13 years ago

contrib: drop blameview/ directory

Jeff King committed over 13 years ago

Move create_notes_commit() from notes-merge.c into notes-utils.c

Johan Herland committed over 13 years ago

Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

Johan Herland committed over 13 years ago

finish_copy_notes_for_rewrite(): Let caller provide commit message

Johan Herland committed over 13 years ago

log: --author-date-order

Junio C Hamano committed over 13 years ago