summaryrefslogtreecommitdiff
path: root/log-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-3/+3
|\
| * log_tree_diff: die when we fail to parse a commitJeff King2013-10-241-3/+3
* | log: use true parents for diff even when rewritingThomas Rast2013-08-011-1/+1
|/
* Merge branch 'jk/format-patch-from'Junio C Hamano2013-07-151-0/+2
|\
| * teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+2
* | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-121-0/+1
|\ \ | |/ |/|
| * pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-261-0/+1
* | Merge branch 'tr/line-log'Junio C Hamano2013-06-021-0/+4
|\ \ | |/ |/|
| * Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+4
* | pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy2013-04-181-16/+32
* | Merge branch 'tr/log-tree-optim'Junio C Hamano2013-04-021-3/+10
|\ \
| * | Avoid loading commits twice in log with diffsThomas Rast2013-03-281-3/+10
| |/
* | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-011-86/+6
|\ \
| * | Unify appending signoff in format-patch, commit and sequencerBrandon Casey2013-02-121-90/+1
| * | format-patch: update append_signoff prototypeNguyễn Thái Ngọc Duy2013-02-121-4/+13
* | | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-211-15/+12
|\ \ \ | |_|/ |/| |
| * | gpg_interface: allow to request status returnMichael J Gruber2013-02-141-2/+2
| * | log-tree: rely upon the check in the gpg_interfaceMichael J Gruber2013-02-141-14/+11
| |/
* | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-201-0/+1
|\ \
| * | mailmap: add mailmap structure to rev_info and ppAntoine Pelisse2013-01-101-0/+1
| |/
* | Merge branch 'jc/format-patch-reroll'Junio C Hamano2013-01-111-21/+31
|\ \
| * | format-patch: add --reroll-count=$N optionJunio C Hamano2012-12-221-0/+2
| * | get_patch_filename(): split into two functionsJunio C Hamano2012-12-211-18/+23
| * | get_patch_filename(): drop "just-numbers" hackJunio C Hamano2012-12-211-15/+14
| * | get_patch_filename(): simplify function signatureJunio C Hamano2012-12-211-4/+8
* | | Merge branch 'jc/format-color-auto'Junio C Hamano2013-01-051-0/+1
|\ \ \ | |_|/ |/| |
| * | log --format: teach %C(auto,black) to respect color configJunio C Hamano2012-12-171-0/+1
| |/
* | format-patch: add a blank line between notes and diffstatJunio C Hamano2012-11-131-10/+21
* | format-patch --notes: show notes after three-dashesJunio C Hamano2012-10-171-4/+11
* | format-patch: append --signature after notesJunio C Hamano2012-10-171-2/+4
* | pretty_print_commit(): do not append notes messageJunio C Hamano2012-10-171-0/+3
* | pretty: prepare notes message at a centralized placeJunio C Hamano2012-10-171-1/+13
|/
* format-patch: refactor get_patch_filenameJeff King2012-05-221-8/+11
* Merge branch 'jk/maint-reflog-walk-count-vs-time'Junio C Hamano2012-05-111-4/+4
|\
| * reflog-walk: tell explicit --date=default from not having --date at allJunio C Hamano2012-05-071-4/+3
| * log: respect date_mode_explicit with --format:%gdJeff King2012-05-041-0/+1
* | Merge branch 'jk/maint-tformat-with-z'Junio C Hamano2012-05-071-1/+1
|\ \
| * | log-tree: use custom line terminator in line termination modeJan Krüger2012-05-011-1/+1
* | | Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano2012-04-231-2/+3
|\ \ \
| * | | log --graph --stat: three-dash separator should come after graph linesLucian Poston2012-03-201-2/+3
| | |/ | |/|
* | | Merge branch 'nd/maint-refname-in-hierarchy-check'Junio C Hamano2012-01-291-2/+2
|\ \ \
| * | | Fix incorrect ref namespace checknd/maint-refname-in-hierarchy-checkNguyễn Thái Ngọc Duy2012-01-111-2/+2
* | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-0/+129
|\ \ \ \
| * | | | log --show-signature: reword the common two-head merge casejc/show-sigJunio C Hamano2012-01-051-0/+12
| * | | | log-tree: show mergetag in log --show-signature outputJunio C Hamano2012-01-051-1/+75
| * | | | log-tree.c: small refactor in show_signature()Junio C Hamano2012-01-051-12/+16
| * | | | log: --show-signatureJunio C Hamano2011-11-121-0/+39
| |/ / /
* | | | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-171-3/+1
|/ / /
* | | Merge branch 'js/log-show-children'Junio C Hamano2011-10-181-0/+12
|\ \ \ | |/ / |/| |
| * | log --childrenjs/log-show-childrenJay Soffian2011-10-041-0/+12