Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/magic-pathspec' | Junio C Hamano | 2013-10-30 | 1 | -1/+2 |
|\ | |||||
| * | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags | Nguyễn Thái Ngọc Duy | 2013-10-22 | 1 | -1/+2 |
* | | Merge branch 'jc/revision-range-unpeel' | Junio C Hamano | 2013-10-28 | 1 | -22/+37 |
|\ \ | |||||
| * | | revision: do not peel tags used in range notation | Junio C Hamano | 2013-10-15 | 1 | -22/+37 |
* | | | Merge branch 'fc/at-head' | Junio C Hamano | 2013-09-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | sha1-name: pass len argument to interpret_branch_name() | Felipe Contreras | 2013-09-03 | 1 | -1/+1 |
* | | | | Merge branch 'jk/free-tree-buffer' | Junio C Hamano | 2013-09-17 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | clear parsed flag when we free tree buffersjk/free-tree-buffer | Jeff King | 2013-06-06 | 1 | -2/+1 |
* | | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 | 1 | -5/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | remove init_pathspec() in favor of parse_pathspec() | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -1/+1 |
| * | | | | remove diff_tree_{setup,release}_paths | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -2/+3 |
| * | | | | convert some get_pathspec() calls to parse_pathspec() | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -2/+2 |
* | | | | | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parents | Thomas Rast | 2013-08-05 | 1 | -3/+25 |
* | | | | | log: use true parents for diff even when rewriting | Thomas Rast | 2013-08-01 | 1 | -1/+42 |
| |_|/ / |/| | | | |||||
* | | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'jc/topo-author-date-sort' | Junio C Hamano | 2013-07-01 | 1 | -5/+8 |
|\ \ \ | |||||
| * | | | log: --author-date-order | Junio C Hamano | 2013-06-11 | 1 | -0/+3 |
| * | | | toposort: rename "lifo" field | Junio C Hamano | 2013-06-11 | 1 | -5/+5 |
| * | | | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge branch 'mh/reflife' | Junio C Hamano | 2013-06-14 | 1 | -26/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | object_array_entry: fix memory handling of the name field | Michael Haggerty | 2013-06-02 | 1 | -2/+4 |
| * | | | | | | revision: use object_array_filter() in implementation of gc_boundary() | Michael Haggerty | 2013-05-28 | 1 | -17/+15 |
| * | | | | | | revision: split some overly-long lines | Michael Haggerty | 2013-05-28 | 1 | -6/+14 |
| * | | | | | | add_rev_cmdline(): make a copy of the name argument | Michael Haggerty | 2013-05-28 | 1 | -1/+5 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'kb/full-history-compute-treesame-carefully-2' | Junio C Hamano | 2013-06-14 | 1 | -65/+474 |
|\ \ \ \ \ \ | |||||
| * | | | | | | revision.c: make default history consider bottom commits | Kevin Bracey | 2013-05-16 | 1 | -1/+1 |
| * | | | | | | revision.c: don't show all merges for --parents | Kevin Bracey | 2013-05-16 | 1 | -7/+15 |
| * | | | | | | revision.c: discount side branches when computing TREESAME | Kevin Bracey | 2013-05-16 | 1 | -21/+150 |
| * | | | | | | revision.c: add BOTTOM flag for commits | Kevin Bracey | 2013-05-16 | 1 | -18/+16 |
| * | | | | | | simplify-merges: drop merge from irrelevant side branch | Kevin Bracey | 2013-05-16 | 1 | -1/+25 |
| * | | | | | | simplify-merges: never remove all TREESAME parents | Kevin Bracey | 2013-05-16 | 1 | -0/+69 |
| * | | | | | | revision.c: Make --full-history consider more merges | Kevin Bracey | 2013-05-16 | 1 | -30/+211 |
* | | | | | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-06-02 | 1 | -9/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Implement line-history search (git log -L) | Thomas Rast | 2013-03-28 | 1 | -0/+9 |
| * | | | | | | Export rewrite_parents() for 'log -L' | Bo Yang | 2013-03-28 | 1 | -9/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | revision.c: treat A...B merge bases as if manually specified | Kevin Bracey | 2013-05-16 | 1 | -0/+17 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'nd/pretty-formats' | Junio C Hamano | 2013-04-23 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs it | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'tr/copy-revisions-from-stdin' | Junio C Hamano | 2013-04-19 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | read_revisions_from_stdin: make copies for handle_revision_arg | Thomas Rast | 2013-04-16 | 1 | -1/+2 |
| * | | | | | Merge branch 'jc/maint-log-grep-all-match-1' into maint | Junio C Hamano | 2012-09-29 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mz/cherry-pick-cmdline-order' into maint | Junio C Hamano | 2012-09-14 | 1 | -3/+15 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -2/+14 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-10 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,... | Junio C Hamano | 2013-04-08 | 1 | -25/+2 |