summaryrefslogtreecommitdiff
path: root/builtin/log.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ah/usage-strings'Junio C Hamano2015-02-111-2/+2
|\
| * standardize usage info string formatAlex Henrie2015-01-141-3/+3
* | Merge branch 'dk/format-patch-ignore-diff-submodule'Junio C Hamano2015-02-111-1/+1
|\ \
| * | format-patch: ignore diff.submodule settingdk/format-patch-ignore-diff-submoduleDoug Kelly2015-01-071-1/+1
* | | Merge branch 'km/log-usage-string-i18n'Junio C Hamano2015-01-141-2/+2
|\ \ \ | |_|/ |/| |
| * | log.c: fix translation markingskm/log-usage-string-i18nKyle J. McKay2015-01-061-2/+2
| * | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-161-6/+7
| |\ \
| * \ \ Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-251-6/+2
| |\ \ \
* | | | | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-011-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-211-1/+2
|\ \ \ \
| * | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+2
* | | | | Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | pass config slots as pointers instead of offsetsJonathan Nieder2014-10-141-1/+1
* | | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-071-2/+4
* | | | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-261-1/+1
|\ \ \ \ \
| * | | | | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-1/+1
* | | | | | Merge branch 'mr/mark-i18n-log-rerere'Junio C Hamano2014-09-191-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | builtin/log.c: mark strings for translationmr/mark-i18n-log-rerereMatthias Ruester2014-09-151-5/+5
| |/ / / /
* | | | | Merge branch 'mm/log-branch-desc-plug-leak'Junio C Hamano2014-09-091-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | builtin/log.c: fix minor memory leakmm/log-branch-desc-plug-leakMatthieu Moy2014-08-071-0/+1
| |/ / /
* | | | use strbuf_addbuf for adding strbufsRené Scharfe2014-07-101-1/+1
* | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-091-6/+6
|\ \ \ \
| * | | | use skip_prefix to avoid repeating stringsJeff King2014-06-201-6/+6
* | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-6/+7
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | commit: record buffer length in cacheJeff King2014-06-131-1/+1
| * | | use get_commit_buffer everywhereJeff King2014-06-131-2/+5
| * | | provide a helper to free commit bufferJeff King2014-06-131-4/+2
| |/ /
* | | Merge branch 'lt/log-auto-decorate'Junio C Hamano2014-06-161-0/+2
|\ \ \
| * | | git log: support "auto" decorationslt/log-auto-decorateLinus Torvalds2014-05-301-0/+2
| |/ /
* | | Merge branch 'jm/format-patch-mail-sig'Junio C Hamano2014-06-161-2/+24
|\ \ \
| * | | format-patch: add "--signature-file=<file>" optionjm/format-patch-mail-sigJeremiah Mahler2014-05-271-0/+17
| * | | format-patch: make newline after signature conditionalJeff King2014-05-211-2/+7
| |/ /
* | | Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano2014-06-161-6/+2
|\ \ \ | |/ / |/| / | |/
| * move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspecJeff King2014-05-201-6/+2
* | comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-4/+4
|/
* Merge branch 'mg/more-textconv'Junio C Hamano2013-10-231-3/+23
|\
| * show: honor --textconv for blobsMichael J Gruber2013-05-101-3/+22
| * diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-101-0/+1
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-1/+1
|\ \
| * | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-151-1/+1
* | | log, format-patch: parsing uses OPT__QUIETStefan Beller2013-08-051-3/+2
* | | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-4/+4
* | | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-051-2/+2
* | | teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+24
|/ /
* | Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-011-1/+1
|\ \
| * | toposort: rename "lifo" fieldJunio C Hamano2013-06-111-1/+1
* | | Merge branch 'tr/line-log'Junio C Hamano2013-06-021-0/+31
|\ \ \
| * | | Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+31
| |/ /
* | | Merge branch 'rr/shortlog-doc'Junio C Hamano2013-04-261-1/+1
|\ \ \ | |_|/ |/| |