summaryrefslogtreecommitdiff
path: root/revision.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-2/+14
|\
| * specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-231-2/+14
* | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
|\ \
| * | diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-0/+2
|\ \ \ | |_|/ |/| |
| * | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-0/+2
| |/
| * Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-211-1/+0
| |\
| * \ Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2012-02-051-1/+9
| |\ \
* | \ \ Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintJunio C Hamano2012-07-111-12/+29
|\ \ \ \
| * | | | revision: ignore side parents while running simplify-mergesJunio C Hamano2012-06-131-3/+11
| * | | | revision: note the lack of free() in simplify_merges()Junio C Hamano2012-06-081-7/+16
| * | | | revision: "simplify" options imply topo-order sortJunio C Hamano2012-06-081-2/+2
* | | | | Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-181-1/+1
| |/ / /
* | | | Merge branch 'rs/commit-list-append'Junio C Hamano2012-04-291-2/+2
|\ \ \ \
| * | | | revision: append to list instead of insert and reverseRené Scharfe2012-04-251-2/+2
* | | | | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-271-10/+14
|\ \ \ \ \
| * | | | | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-151-10/+14
* | | | | | Merge branch 'hv/submodule-recurse-push'Junio C Hamano2012-04-241-0/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt2012-03-301-0/+5
* | | | | | Merge branch 'rs/commit-list-sort-in-batch'Junio C Hamano2012-04-231-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | revision: insert unsorted, then sort in prepare_revision_walk()René Scharfe2012-04-111-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano2012-03-071-0/+1
|\ \ \ \ \
| * | | | | pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano2012-02-281-0/+1
* | | | | | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-141-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | grep: drop grep_buffer's "name" parameterJeff King2012-02-021-1/+0
| | |/ / | |/| |
* | | | Merge branch 'nd/index-pack-no-recurse'Junio C Hamano2012-01-291-16/+29
|\ \ \ \
| * | | | Eliminate recursion in setting/clearing marks in commit listNguyễn Thái Ngọc Duy2012-01-161-16/+29
| | |/ / | |/| |
* | | | Merge branch 'jc/maint-log-first-parent-pathspec'Junio C Hamano2012-01-291-1/+9
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspecJunio C Hamano2012-01-191-1/+9
* | | log: --show-signatureJunio C Hamano2011-11-121-0/+2
| |/ |/|
* | Merge branch 'rs/pending'Junio C Hamano2011-10-131-2/+10
|\ \
| * | revision: add leak_pending flagRené Scharfe2011-10-031-1/+2
| * | revision: factor out add_pending_sha1René Scharfe2011-10-031-3/+8
| |/
* | Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano2011-10-131-2/+4
|\ \
| * | Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-181-2/+4
| |/
* | Merge branch 'jc/fetch-verify'Junio C Hamano2011-10-051-0/+5
|\ \
| * | rev-list --verify-objectJunio C Hamano2011-09-011-0/+5
* | | Merge branch 'jc/traverse-commit-list'Junio C Hamano2011-10-051-0/+41
|\ \ \ | |/ /
| * | revision.c: update show_object_with_name() without using malloc()Junio C Hamano2011-08-221-14/+36
| * | revision.c: add show_object_with_name() helper functionJunio C Hamano2011-08-221-0/+19
| |/
* | Merge branch 'bk/ancestry-path'Junio C Hamano2011-10-051-10/+43
|\ \ | |/ |/|
| * revision: do not include sibling history in --ancestry-path outputJunio C Hamano2011-08-251-6/+10
| * revision: keep track of the end-user input from the command lineJunio C Hamano2011-08-251-4/+33
* | Merge branch 'jc/notes-batch-removal'Junio C Hamano2011-05-291-2/+13
|\ \
| * | show: --ignore-missingJunio C Hamano2011-05-191-2/+13
* | | Merge branch 'js/log-abbrev-commit-config'Junio C Hamano2011-05-251-0/+3
|\ \ \
| * | | Add log.abbrevCommit config variableJay Soffian2011-05-181-0/+3
| |/ /
* | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-0/+14
|\ \ \
| * | | revision.c: leave a note for "a lone :" enhancementJunio C Hamano2011-05-111-0/+14