summaryrefslogtreecommitdiff
path: root/commit.c
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'vm/octopus-merge-bases-simplify'Junio C Hamano2014-01-101-18/+18
|\
| * get_octopus_merge_bases(): cleanup redundant variablevm/octopus-merge-bases-simplifyVasily Makarov2014-01-031-18/+18
* | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-101-5/+5
|\ \
| * | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-271-5/+5
* | | Merge branch 'nd/commit-tree-constness'Junio C Hamano2014-01-101-2/+2
|\ \ \ | |_|/ |/| |
| * | commit.c: make "tree" a const pointer in commit_tree*()nd/commit-tree-constnessNguyễn Thái Ngọc Duy2013-12-261-2/+2
| |/
* | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-3/+3
|\ \
| * | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-3/+3
| |/
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-1/+8
|\ \ | |/ |/|
| * assume parse_commit checks for NULL commitJeff King2013-10-241-1/+1
| * log_tree_diff: die when we fail to parse a commitJeff King2013-10-241-0/+7
* | Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano2013-09-091-0/+16
|\ \ | |/ |/|
| * log: use true parents for diff even when rewritingThomas Rast2013-08-011-0/+16
* | Merge branch 'bc/commit-invalid-utf8'Junio C Hamano2013-08-051-1/+1
|\ \ | |/ |/|
| * commit: typofix for xxFFF[EF] checkbc/commit-invalid-utf8Junio C Hamano2013-08-051-1/+1
* | Merge branch 'bc/commit-invalid-utf8'Junio C Hamano2013-07-181-6/+32
|\ \ | |/
| * commit: reject non-charactersPeter Krefting2013-07-091-2/+5
| * commit: reject overlong UTF-8 sequencesbrian m. carlson2013-07-041-6/+12
| * commit: reject invalid UTF-8 codepointsbrian m. carlson2013-07-041-5/+22
* | commit.c: make compare_commits_by_commit_date globalJeff King2013-07-021-1/+1
* | Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-011-27/+118
|\ \
| * | log: --author-date-orderJunio C Hamano2013-06-111-0/+74
| * | sort-in-topological-order: use prio-queueJunio C Hamano2013-06-111-31/+44
| * | toposort: rename "lifo" fieldJunio C Hamano2013-06-111-4/+8
* | | Merge branch 'jk/commit-info-slab'Junio C Hamano2013-07-011-9/+28
|\ \ \ | |/ / | | / | |/ |/|
| * commit-slab: introduce a macro to define a slab for new typeJunio C Hamano2013-06-071-58/+14
| * commit-slab: avoid large reallocJunio C Hamano2013-04-131-20/+42
| * commit: allow associating auxiliary info on-demandJeff King2013-04-131-9/+50
* | Sync with 'maint'Junio C Hamano2013-04-121-1/+1
|\ \ | |/
| * Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-1/+1
* | merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-311-5/+9
* | commit.c/GPG signature verification: Also look at the first GPG status lineSebastian Götte2013-03-311-5/+12
* | Move commit GPG signature verification to commit.cSebastian Götte2013-03-311-0/+59
* | commit.c: use clear_commit_marks_many() in in_merge_bases_many()Junio C Hamano2013-03-051-2/+1
* | commit.c: add in_merge_bases_many()Junio C Hamano2013-03-051-6/+18
* | commit.c: add clear_commit_marks_many()Junio C Hamano2013-03-051-6/+13
|/
* Move print_commit_list to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+10
* Merge branch 'jc/merge-bases-paint-fix'Junio C Hamano2012-10-081-0/+5
|\
| * paint_down_to_common(): parse commit before relying on its timestampJunio C Hamano2012-10-041-0/+5
* | commit.c: mark a file-scope private symbol as staticJunio C Hamano2012-09-151-2/+5
* | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-91/+120
|\ \ | |/
| * reduce_heads(): reimplement on top of remove_redundant()Junio C Hamano2012-08-311-38/+18
| * get_merge_bases_many(): walk from many tips in parallelJunio C Hamano2012-08-301-21/+58
| * in_merge_bases(): use paint_down_to_common()Junio C Hamano2012-08-301-10/+7
| * merge_bases_many(): split out the logic to paint historyJunio C Hamano2012-08-301-19/+28
| * in_merge_bases(): omit unnecessary redundant common ancestor reductionThomas Rast2012-08-281-1/+4
| * in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-271-6/+9
* | Merge branch 'lt/commit-tree-guess-utf-8'Junio C Hamano2012-09-071-2/+86
|\ \
| * | commit/commit-tree: correct latin1 to utf-8Linus Torvalds2012-08-211-2/+86
* | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-1/+1
|\ \ \ | |/ / |/| |