aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
AgeCommit message (Expand)AuthorFilesLines
2014-12-11commit: always populate GIT_AUTHOR_* variablesJeff King1-21/+5
2014-12-11commit: loosen ident checks when generating templateJeff King1-9/+14
2014-12-01commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy1-1/+1
2014-11-10commit: make ignore_non_trailer() non staticChristian Couder1-46/+0
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano1-26/+48
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano1-16/+31
2014-10-28builtin/commit.c: extract ignore_non_trailer() helper functionJunio C Hamano1-26/+33
2014-10-21Merge branch 'rs/ref-transaction'Junio C Hamano1-3/+3
2014-10-20Merge branch 'jn/parse-config-slot'Junio C Hamano1-12/+10
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg1-2/+2
2014-10-14color_parse: do not mention variable name in error messageJeff King1-2/+1
2014-10-14pass config slots as pointers instead of offsetsJonathan Nieder1-10/+9
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano1-9/+9
2014-10-07use skip_prefix() to avoid more magic numbersRené Scharfe1-9/+9
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-10-01lockfile: change lock_file::filename into a strbufMichael Haggerty1-6/+6
2014-10-01prepare_index(): declare return value to be (const char *)Michael Haggerty1-2/+2
2014-09-19Merge branch 'ah/grammofix'Junio C Hamano1-1/+1
2014-09-19Merge branch 'jk/commit-author-parsing'Junio C Hamano1-41/+48
2014-09-11Merge branch 'dt/cache-tree-repair'Junio C Hamano1-1/+13
2014-09-11Merge branch 'rs/ref-transaction-1'Junio C Hamano1-13/+12
2014-09-11Merge branch 'rs/child-process-init'Junio C Hamano1-2/+1
2014-09-09Merge branch 'sb/prepare-revision-walk-error-check'Junio C Hamano1-1/+2
2014-09-03commit.c: use ref transactions for updatesRonnie Sahlberg1-13/+12
2014-09-02Merge branch 'mm/config-edit-global'Junio C Hamano1-2/+33
2014-09-02grammofix in user-facing messagesAlex Henrie1-1/+1
2014-08-29determine_author_info(): copy getenv outputJeff King1-13/+27
2014-08-29determine_author_info(): reuse parsing functionsJeff King1-28/+21
2014-08-27date: use strbufs in date-formatting functionsJeff King1-10/+10
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-2/+1
2014-08-12prepare_revision_walk(): check for return value in all placesStefan Beller1-1/+2
2014-07-25commit: advertise config --global --edit on guessed identityMatthieu Moy1-2/+33
2014-07-23Merge branch 'ta/string-list-init'Junio C Hamano1-2/+1
2014-07-22Merge branch 'rs/code-cleaning'Junio C Hamano1-1/+1
2014-07-21replace memset with string-list initializersTanay Abhra1-2/+1
2014-07-17strbuf: use strbuf_addstr() for adding C stringsRené Scharfe1-1/+1
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-19/+14
2014-07-16Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano1-2/+2
2014-07-14cache-tree: Write updated cache-tree after commitDavid Turner1-1/+17
2014-07-09Merge branch 'jk/skip-prefix'Junio C Hamano1-3/+2
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano1-2/+2
2014-06-25Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano1-2/+16
2014-06-25Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano1-3/+2
2014-06-20refactor skip_prefix to return a booleanJeff King1-3/+2
2014-06-16Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano1-2/+16
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-19/+14
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufJeff King1-2/+2
2014-06-06Merge branch 'nd/status-auto-comment-char'Junio C Hamano1-0/+32
2014-06-06Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano1-1/+1
2014-06-06Merge branch 'jk/commit-C-pick-empty'Junio C Hamano1-3/+2
2014-06-03Merge branch 'jk/commit-date-approxidate'Junio C Hamano1-19/+60
2014-05-19commit: allow core.commentChar=auto for character auto selectionNguyễn Thái Ngọc Duy1-0/+32
2014-05-07silence a bunch of format-zero-length warningsFelipe Contreras1-1/+1
2014-05-02commit: accept more date formats for "--date"Jeff King1-2/+25
2014-05-02commit: print "Date" line when the user has set dateJeff King1-0/+19
2014-05-02commit: use split_ident_line to compare author/committerJeff King1-17/+16
2014-04-28commit: do not complain of empty messages from -CJeff King1-3/+2
2014-04-17commit.c: check for lock error and return earlyRonnie Sahlberg1-4/+4
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano1-1/+1
2014-04-07commit -m: commit staged submodules regardless of ignore configJens Lehmann1-2/+16
2014-03-31code and test: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-28Merge branch 'bp/commit-p-editor'Junio C Hamano1-7/+28
2014-03-25Merge branch 'nd/commit-editor-cleanup'Junio C Hamano1-3/+11
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano1-1/+1
2014-03-18commit: fix patch hunk editing with "commit -p -m"Benoit Pierre1-7/+28
2014-02-27Merge branch 'ep/varscope'Junio C Hamano1-5/+6
2014-02-27Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano1-1/+1
2014-02-27Merge branch 'nv/commit-gpgsign-config'Junio C Hamano1-0/+4
2014-02-25commit: add --cleanup=scissorsNguyễn Thái Ngọc Duy1-3/+11
2014-02-24commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier1-0/+4
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy1-1/+1
2014-01-31builtin/commit.c: reduce scope of variablesElia Pinto1-5/+6
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano1-5/+5
2013-12-17Merge branch 'jl/commit-v-strip-marker'Junio C Hamano1-6/+3
2013-12-05commit -v: strip diffs and submodule shortlogs from the commit messageJens Lehmann1-6/+3
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-5/+5
2013-12-05Merge branch 'jk/robustify-parse-commit'Junio C Hamano1-2/+2
2013-10-24assume parse_commit checks for NULL commitJeff King1-2/+2
2013-09-20Merge branch 'mm/commit-template-squelch-advice-messages'Junio C Hamano1-8/+17
2013-09-20Merge branch 'bk/refs-multi-update'Junio C Hamano1-1/+1
2013-09-20Merge branch 'mm/status-without-comment-char'Junio C Hamano1-0/+10
2013-09-17Merge branch 'ap/commit-author-mailmap'Junio C Hamano1-1/+7
2013-09-12commit: disable status hints when writing to COMMIT_EDITMSGMatthieu Moy1-0/+6
2013-09-12wt-status: turn advice_status_hints into a field of wt_statusMatthieu Moy1-0/+1
2013-09-12commit: factor status configuration is a helper functionMatthieu Moy1-8/+10
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-19/+18
2013-09-06status: disable display of '#' comment prefix by defaultMatthieu Moy1-0/+10
2013-09-04Merge branch 'sb/parseopt-boolean-removal'Junio C Hamano1-25/+23
2013-08-30refs: report ref type from lock_any_ref_for_updateBrad King1-1/+1
2013-08-24commit: search author pattern against mailmapAntoine Pelisse1-1/+7
2013-08-07branch, commit, name-rev: ease up boolean conditionsStefan Beller1-1/+1
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-18/+18
2013-08-05Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller1-6/+4
2013-07-31Merge branch 'jk/commit-how-to-abort-cherry-pick'Junio C Hamano1-3/+22
2013-07-29commit: tweak empty cherry pick advice for sequencerJeff King1-3/+22
2013-07-24Merge branch 'sb/misc-fixes'Junio C Hamano1-1/+0
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-1/+1
2013-07-15convert common_prefix() to use struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-07-15convert add_files_to_cache to take struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-07-15convert refresh_index to take struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-07-15convert report_path_error to take struct pathspecNguyễn Thái Ngọc Duy1-8/+6
2013-07-15convert read_cache_preload() to take struct pathspecNguyễn Thái Ngọc Duy1-2/+2
2013-07-15status: convert to use parse_pathspecNguyễn Thái Ngọc Duy1-4/+5
2013-07-15commit: convert to use parse_pathspecNguyễn Thái Ngọc Duy1-9/+9
2013-07-15commit: Fix a memory leak in determine_author_infoStefan Beller1-1/+0
2013-07-11Merge branch 'jg/status-config'Junio C Hamano1-19/+64
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-1/+1
2013-06-24Merge branch 'jh/libify-note-handling'Junio C Hamano1-1/+2
2013-06-24status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano1-22/+55
2013-06-24commit: make it work with status.shortRamkumar Ramachandra1-0/+1
2013-06-24status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia1-0/+4
2013-06-24status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia1-0/+7
2013-06-24Revert "Merge branch 'jg/status-config'"Junio C Hamano1-11/+0
2013-06-23Merge branch 'jg/status-config'Junio C Hamano1-0/+11
2013-06-15status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia1-0/+4
2013-06-12Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland1-0/+1
2013-06-12finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland1-1/+1
2013-06-11status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia1-0/+7
2013-06-05Merge branch 'rs/commit-m-no-edit'Junio C Hamano1-4/+6
2013-05-28commit: don't start editor if empty message is given with -mRené Scharfe1-4/+6
2013-04-18pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy1-1/+1
2013-04-01Merge branch 'bc/append-signed-off-by'Junio C Hamano1-1/+1
2013-02-19git-commit: only append a newline to -m mesg if necessaryBrandon Casey1-1/+3
2013-02-12Merge branch 'maint'Junio C Hamano1-2/+2
2013-02-12sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey1-1/+1
2013-02-12Replace filepattern with pathspec for consistencyMatthieu Moy1-2/+2
2013-02-04Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano1-12/+2
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano1-6/+6
2013-01-26logmsg_reencode: never return NULLJeff King1-12/+2
2013-01-26commit: drop useless xstrdup of commit messageJeff King1-1/+1
2013-01-23Merge branch 'as/pre-push-hook'Junio C Hamano1-4/+2
2013-01-16Allow custom "comment char"Junio C Hamano1-6/+6
2013-01-14hooks: Add function to check if a hook existsAaron Schrab1-4/+2
2013-01-10commit: make default of "cleanup" option configurableRalf Thielow1-1/+3
2012-11-15ident: keep separate "explicit" flags for author and committerJeff King1-2/+2
2012-10-18status: add --long output format optionJeff King1-6/+23
2012-10-01Merge branch 'os/commit-submodule-ignore'Junio C Hamano1-0/+1
2012-09-24commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh1-0/+1
2012-09-14cherry-pick: don't forget -s on failureMiklos Vajna1-57/+24
2012-09-11Merge branch 'jc/maint-ident-missing-human-name'Junio C Hamano1-1/+16
2012-08-31split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano1-1/+16
2012-08-24Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano1-1/+1
2012-08-20i18n: status: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-11/+11
2012-08-20i18n: commit: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-39/+39
2012-07-24Merge branch 'jk/maint-commit-check-committer-early'Junio C Hamano1-1/+1
2012-07-23commit: check committer identity more strictlyJeff King1-1/+1
2012-07-22Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano1-1/+1
2012-07-22Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano1-1/+4
2012-07-15Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano1-1/+4
2012-07-15Merge branch 'cw/amend-commit-without-message'Junio C Hamano1-1/+1
2012-07-09Allow edit of empty message with commit --amendChris Webb1-1/+1
2012-05-24ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King1-2/+1
2012-05-08status: refactor colopts handlingJeff King1-5/+4
2012-05-08Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King1-68/+67
2012-05-08status: respect "-b" for porcelain formatJeff King1-5/+4
2012-05-08status: refactor null_termination optionJeff King1-9/+8
2012-05-08commit: refactor option parsingJeff King1-58/+59
2012-05-03Merge branch 'nd/columns'Junio C Hamano1-0/+7
2012-04-30git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason1-7/+6
2012-04-30git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason1-29/+23
2012-04-27status: add --columnNguyễn Thái Ngọc Duy1-0/+7
2012-04-26Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano1-19/+43
2012-04-26Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano1-3/+19
2012-04-16Merge branch 'jc/commit-unedited-template'Junio C Hamano1-19/+43
2012-04-15Merge branch 'jc/commit-hook-authorship'Junio C Hamano1-3/+19
2012-03-30commit: rephrase the error when user did not touch templated log messageJunio C Hamano1-19/+41
2012-03-30commit: do not trigger bogus "has templated message edited" checkJunio C Hamano1-0/+2
2012-03-11commit: pass author/committer info to hooksJunio C Hamano1-3/+19
2012-02-16Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano1-3/+3
2012-02-13Merge branch 'jc/parse-date-raw' into maintJunio C Hamano1-0/+6
2012-02-12Merge branch 'nd/cache-tree-api-refactor'Junio C Hamano1-2/+2
2012-02-10Merge branch 'jc/parse-date-raw'Junio C Hamano1-0/+6
2012-02-07cache-tree: update API to take abitrary flagsNguyễn Thái Ngọc Duy1-2/+2
2012-02-03parse_date(): '@' prefix forces git-timestampJunio C Hamano1-0/+6
2012-02-01i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin1-3/+3
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano1-2/+12
2012-01-05commit --amend -S: strip existing gpgsig headersJunio C Hamano1-1/+2
2012-01-05Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano1-1/+10
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano1-1/+1
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano1-1/+1
2011-12-21Sync with v1.7.8.1Junio C Hamano1-1/+1
2011-12-21Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano1-1/+1
2011-12-20Merge branch 'jc/pull-signed-tag'Junio C Hamano1-1/+5
2011-12-20commit: do not lose mergetag header when not amendingJunio C Hamano1-1/+5
2011-12-19Merge branch 'nd/resolve-ref'Junio C Hamano1-1/+1
2011-12-19Merge branch 'tr/cache-tree'Junio C Hamano1-4/+3
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano1-0/+1310
2011-12-16Merge branch 'jc/commit-amend-no-edit'Junio C Hamano1-4/+5
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy1-1/+1
2011-12-13Rename resolve_ref() to resolve_ref_unsafe()Nguyễn Thái Ngọc Duy1-1/+1
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano1-1/+2
2011-12-09Merge branch 'jc/pull-signed-tag'Junio C Hamano1-7/+12
2011-12-08commit: honour --no-editJunio C Hamano1-4/+5
2011-12-06commit: write cache-tree data when writing index anywayThomas Rast1-0/+2
2011-12-06Refactor cache_tree_update idiom from commitThomas Rast1-4/+1
2011-12-05Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy1-1/+2
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder1-0/+1
2011-11-12commit: teach --gpg-sign optionJunio C Hamano1-1/+10