summaryrefslogtreecommitdiff
path: root/builtin/commit.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-221-26/+2
|\
| * commit: make ignore_non_trailer() non staticChristian Couder2014-11-101-46/+0
| * Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-101-26/+48
| |\
| | * merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-281-16/+31
| | * builtin/commit.c: extract ignore_non_trailer() helper functionJunio C Hamano2014-10-281-26/+33
* | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-211-3/+3
|\ \ \
| * | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
| * | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-151-2/+2
* | | | Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-201-12/+10
|\ \ \ \ | |/ / / |/| | |
| * | | color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-141-2/+1
| * | | pass config slots as pointers instead of offsetsJonathan Nieder2014-10-141-10/+9
* | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-141-9/+9
|\ \ \ \
| * | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-071-9/+9
* | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* | | | | lockfile: change lock_file::filename into a strbufMichael Haggerty2014-10-011-6/+6
* | | | | prepare_index(): declare return value to be (const char *)Michael Haggerty2014-10-011-2/+2
|/ / / /
* | | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-191-1/+1
|\ \ \ \
| * | | | grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-021-1/+1
| |/ / /
* | | | Merge branch 'jk/commit-author-parsing'Junio C Hamano2014-09-191-41/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | determine_author_info(): copy getenv outputjk/commit-author-parsingJeff King2014-08-291-13/+27
| * | | determine_author_info(): reuse parsing functionsJeff King2014-08-291-28/+21
| * | | date: use strbufs in date-formatting functionsJeff King2014-08-271-10/+10
| |/ /
* | | Merge branch 'dt/cache-tree-repair'Junio C Hamano2014-09-111-1/+13
|\ \ \
| * | | cache-tree: Write updated cache-tree after commitDavid Turner2014-07-141-1/+17
* | | | Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-111-13/+12
|\ \ \ \
| * | | | commit.c: use ref transactions for updatesRonnie Sahlberg2014-09-031-13/+12
* | | | | Merge branch 'rs/child-process-init'Junio C Hamano2014-09-111-2/+1
|\ \ \ \ \
| * | | | | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/prepare-revision-walk-error-check'Junio C Hamano2014-09-091-1/+2
|\ \ \ \ \
| * | | | | prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-checkStefan Beller2014-08-121-1/+2
* | | | | | Merge branch 'mm/config-edit-global'Junio C Hamano2014-09-021-2/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-globalMatthieu Moy2014-07-251-2/+33
| |/ / / /
| * | | | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-161-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-3/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ta/string-list-init'Junio C Hamano2014-07-231-2/+1
|\ \ \ \ \ \ \
| * | | | | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-211-2/+1
* | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-171-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-19/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-19/+14
| |/ / / / / /
* | | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-091-3/+2
|\ \ \ \ \ \ \
| * | | | | | | refactor skip_prefix to return a booleanJeff King2014-06-201-3/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-121-2/+2
| |/ / / /
* | | | | Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-161-2/+16
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-071-2/+16
* | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-061-0/+32
|\ \ \ \ \
| * | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+32
| | |/ / / | |/| | |
* | | | | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano2014-06-061-1/+1
|\ \ \ \ \