summaryrefslogtreecommitdiff
path: root/builtin/log.c
Commit message (Expand)AuthorAgeFilesLines
* builtin/log.c: minor reformatjc/log-p-ccJunio C Hamano2015-08-251-4/+2
* log: show merge commit when --cc is givenJunio C Hamano2015-08-201-0/+4
* log: when --cc is given, default to -p unless told otherwiseJunio C Hamano2015-08-201-0/+4
* log: rename "tweak" helpersJunio C Hamano2015-08-201-5/+6
* Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-2/+2
|\
| * convert "enum date_mode" into a structJeff King2015-06-291-2/+2
* | Merge branch 'dt/log-follow-config'Junio C Hamano2015-08-031-0/+16
|\ \
| * | log: add "log.follow" configuration variableDavid Turner2015-07-091-0/+16
| |/
* | Merge branch 'mh/init-delete-refs-api'Junio C Hamano2015-08-031-0/+1
|\ \ | |/ |/|
| * refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-221-0/+1
* | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2015-06-241-6/+6
|\ \ | |/ |/|
| * format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marksJunio C Hamano2015-06-011-6/+6
* | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-051-5/+2
|\ \
| * | remote.c: report specific errors from branch_get_upstreamJeff King2015-05-211-1/+1
| * | remote.c: introduce branch_get_upstream helperJeff King2015-05-211-5/+2
* | | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-031-1/+1
|/ /
* | 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
View Lorry Controller Status