summaryrefslogtreecommitdiff
path: root/revision.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/reflife'Junio C Hamano2013-06-141-26/+38
|\
| * object_array_entry: fix memory handling of the name fieldMichael Haggerty2013-06-021-2/+4
| * revision: use object_array_filter() in implementation of gc_boundary()Michael Haggerty2013-05-281-17/+15
| * revision: split some overly-long linesMichael Haggerty2013-05-281-6/+14
| * add_rev_cmdline(): make a copy of the name argumentMichael Haggerty2013-05-281-1/+5
* | Merge branch 'kb/full-history-compute-treesame-carefully-2'Junio C Hamano2013-06-141-65/+474
|\ \
| * | revision.c: make default history consider bottom commitsKevin Bracey2013-05-161-1/+1
| * | revision.c: don't show all merges for --parentsKevin Bracey2013-05-161-7/+15
| * | revision.c: discount side branches when computing TREESAMEKevin Bracey2013-05-161-21/+150
| * | revision.c: add BOTTOM flag for commitsKevin Bracey2013-05-161-18/+16
| * | simplify-merges: drop merge from irrelevant side branchKevin Bracey2013-05-161-1/+25
| * | simplify-merges: never remove all TREESAME parentsKevin Bracey2013-05-161-0/+69
| * | revision.c: Make --full-history consider more mergesKevin Bracey2013-05-161-30/+211
* | | Merge branch 'tr/line-log'Junio C Hamano2013-06-021-9/+13
|\ \ \ | |/ / |/| |
| * | Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+9
| * | Export rewrite_parents() for 'log -L'Bo Yang2013-03-281-9/+4
* | | revision.c: treat A...B merge bases as if manually specifiedKevin Bracey2013-05-161-0/+17
| |/ |/|
* | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-231-1/+1
|\ \
| * | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-181-1/+1
* | | Merge branch 'tr/copy-revisions-from-stdin'Junio C Hamano2013-04-191-1/+2
|\ \ \ | |/ / |/| |
| * | read_revisions_from_stdin: make copies for handle_revision_argThomas Rast2013-04-161-1/+2
| * | Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano2012-09-291-0/+2
| |\ \
| * \ \ Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-141-3/+15
| |\ \ \
| * \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-121-2/+14
| |\ \ \ \
| | * \ \ \ Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-2/+14
| | |\ \ \ \
| * | \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-111-2/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-101-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-0/+2
| | |\ \ \ \ \ \
* | | | | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,...Junio C Hamano2013-04-081-25/+2
* | | | | | | | | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second'Junio C Hamano2013-03-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix revision walk for commits with the same datesKacper Kornet2013-03-221-1/+1
* | | | | | | | | | Merge branch 'jc/remove-treesame-parent-in-simplify-merges'Junio C Hamano2013-03-281-3/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | simplify-merges: drop merge from irrelevant side branchJunio C Hamano2013-01-171-0/+23
* | | | | | | | | | log: re-encode commit messages before greppingJeff King2013-02-111-7/+20
* | | | | | | | | | log --use-mailmap: optimize for cases without --author/--committer searchJunio C Hamano2013-01-101-1/+1
* | | | | | | | | | log: grep author/committer using mailmapAntoine Pelisse2013-01-101-0/+54
* | | | | | | | | | Merge branch 'jc/prettier-pretty-note'Junio C Hamano2012-11-151-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format_note(): simplify APIJunio C Hamano2012-10-171-1/+1
* | | | | | | | | | | log --grep: accept --basic-regexp and --perl-regexpJunio C Hamano2012-10-091-0/+4
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | log --grep: use the same helper to set -E/-F options as "git grep"Junio C Hamano2012-10-091-2/+2
* | | | | | | | | | revisions: initialize revs->grep_filter using grep_init()Junio C Hamano2012-10-091-2/+4
|/ / / / / / / / /
* | | | | | | | | revision: make --grep search in notes too if shownNguyễn Thái Ngọc Duy2012-09-291-0/+8
* | | | | | | | | log --grep-reflog: reject the option without -gJunio C Hamano2012-09-291-2/+11
* | | | | | | | | revision: add --grep-reflog to filter commits by reflog messagesNguyễn Thái Ngọc Duy2012-09-291-2/+18
* | | | | | | | | Merge branch 'jc/maint-log-grep-all-match'Junio C Hamano2012-09-181-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | grep: teach --debug option to dump the parse treeJunio C Hamano2012-09-141-0/+2
* | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-101-3/+15
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-301-3/+15
* | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory'Junio C Hamano2012-09-071-2/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |