Documentation/merge-options.txt: restore `-e` option

Richard Hansen committed over 13 years ago

gitk: Update Swedish translation (304t)

Peter Krefting committed over 13 years ago

Revert "remote-hg: update bookmarks when pulling"

Felipe Contreras committed over 13 years ago

git-gui: allow "\ No newline at end of file" for linewise staging

Heiko Voigt committed over 13 years ago

strbuf_branchname(): do not double-expand @{-1}~22

Junio C Hamano committed over 13 years ago

git-submodule.txt: Clarify 'init' and 'add' subcommands.

Dale R. Worley committed over 13 years ago

revision.c: make default history consider bottom commits

Kevin Bracey committed over 13 years ago

revision.c: don't show all merges for --parents

Kevin Bracey committed over 13 years ago

revision.c: discount side branches when computing TREESAME

Kevin Bracey committed over 13 years ago

revision.c: add BOTTOM flag for commits

Kevin Bracey committed over 13 years ago

simplify-merges: drop merge from irrelevant side branch

Kevin Bracey committed over 13 years ago

simplify-merges: never remove all TREESAME parents

Kevin Bracey committed over 13 years ago

t6012: update test for tweaked full-history traversal

Junio C Hamano committed over 13 years ago

revision.c: Make --full-history consider more merges

Kevin Bracey committed over 13 years ago

Documentation: avoid "uninteresting"

Kevin Bracey committed over 13 years ago

rev-list-options.txt: correct TREESAME for P

Kevin Bracey committed over 13 years ago

t6111: add parents to tests

Kevin Bracey committed over 13 years ago

t6111: allow checking the parents as well

Junio C Hamano committed over 13 years ago

t6111: new TREESAME test set

Kevin Bracey committed over 13 years ago

t6019: test file dropped in -s ours merge

Kevin Bracey committed over 13 years ago