summaryrefslogtreecommitdiff
path: root/builtin/commit.c
Commit message (Expand)AuthorAgeFilesLines
* commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-101-0/+10
* Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-061-1/+10
|\
| * commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-1/+10
* | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-0/+1
* | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-281-1/+1
|\ \
| * | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-1/+1
* | | Merge branch 'js/fopen-harder'Junio C Hamano2016-01-201-1/+1
|\ \ \ | |/ / |/| |
| * | commit: allow editing the commit message even in shared reposJohannes Schindelin2016-01-071-1/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2015-12-101-4/+4
|\ \ \ | |/ / |/| |
| * | Remove get_object_hash.brian m. carlson2015-11-201-4/+4
| * | Add several uses of get_object_hash.brian m. carlson2015-11-201-4/+4
* | | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-161-0/+3
|/ /
* | strbuf: make stripspace() part of strbufTobias Klauser2015-10-161-3/+3
* | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-011-3/+1
|\ \
| * | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-3/+1
* | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-7/+8
|\ \ \ | |_|/ |/| |
| * | lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-101-7/+8
| |/
* | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-16/+16
* | convert "enum date_mode" into a structJeff King2015-06-291-2/+2
|/
* Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-261-2/+3
|\
| * status: enable untracked cacheNguyễn Thái Ngọc Duy2015-03-121-2/+3
* | Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-111-5/+3
|\ \
| * | git-commit: replace use of home_config_paths()Paul Tan2015-05-061-5/+3
* | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-1/+1
|\ \ \
| * | | commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy2014-12-011-1/+1
* | | | commit.c: fix a memory leakStefan Beller2015-03-231-2/+4
| |_|/ |/| |
* | | Merge branch 'mh/refs-have-new'Junio C Hamano2015-03-051-2/+2
|\ \ \
| * | | commit: avoid race when creating orphan commitsMichael Haggerty2015-02-171-1/+1
| * | | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-171-1/+1
* | | | Merge branch 'mg/commit-author-no-match-malformed-message'Junio C Hamano2015-02-171-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | commit: reword --author error messagemg/commit-author-no-match-malformed-messageMichael J Gruber2015-01-261-1/+1
* | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-111-2/+2
|\ \ \ \
| * | | | standardize usage info string formatAlex Henrie2015-01-141-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-111-9/+3
|\ \ \ \ | |/ / / |/| | |
| * | | builtin/commit.c: use xstrdup_or_null instead of envdupJeff King2015-01-131-9/+3
* | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-12-221-30/+18
|\ \ \ \
| * | | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidateJeff King2014-12-111-21/+5
| * | | | commit: loosen ident checks when generating templateJeff King2014-12-111-9/+14
* | | | | 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
|\ \ \ \ \ \ \