merge-recursive: get rid of virtual_id
Miklos Vajna committed about 18 years ago
Mention the fact that 'git annotate' is only for backward compatibility.
Junio C Hamano committed about 18 years ago
"blame -c" should be compatible with "annotate"
Junio C Hamano committed about 18 years ago
merge-recursive: move current_{file,directory}_set to struct merge_options
Miklos Vajna committed about 18 years ago
merge-recursive: move the global obuf to struct merge_options
Miklos Vajna committed about 18 years ago
merge-recursive: get rid of the index_only global variable
Miklos Vajna committed about 18 years ago
Merge branch 'jc/maint-log-grep'
Junio C Hamano committed about 18 years ago
log --author/--committer: really match only with name part
Junio C Hamano committed about 18 years ago
Shawn O. Pearce committed about 18 years ago
git-gui: Fix diff parsing for lines starting with "--" or "++"
Shawn O. Pearce committed about 18 years ago
git-gui: Show special diffs for complex conflict cases.
Alexander Gavrilov committed about 18 years ago
git-gui: Make F5 reselect a diff, if an untracked file is selected.
Alexander Gavrilov committed about 18 years ago
git-gui: Reimplement and enhance auto-selection of diffs.
Alexander Gavrilov committed about 18 years ago
git-gui: Support conflict states _U & UT.
Alexander Gavrilov committed about 18 years ago
git-gui: Support more merge tools.
Alexander Gavrilov committed about 18 years ago
git-gui: Don't allow staging files with conflicts.
Alexander Gavrilov committed about 18 years ago
git-gui: Support calling merge tools.
Alexander Gavrilov committed about 18 years ago
git-gui: Support resolving conflicts via the diff context menu.
Alexander Gavrilov committed about 18 years ago
git-gui: Mark forgotten strings for translation.
Christian Stimming committed about 18 years ago
add '%d' pretty format specifier to show decoration
René Scharfe committed about 18 years ago