summaryrefslogtreecommitdiff
path: root/builtin/commit.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano2017-11-151-1/+1
|\
| * reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-081-1/+1
* | Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-131-6/+25
|\ \
| * | status: add option to show ignored files differentlyJameson Miller2017-10-311-6/+25
| |/
* | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-3/+4
|\ \
| * | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-2/+2
| * | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-011-3/+4
| |/
* | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-2/+2
|\ \
| * | refs: update ref transactions to use struct object_idbrian m. carlson2017-10-161-2/+2
| |/
* | Merge branch 'ao/check-resolve-ref-unsafe-result'Junio C Hamano2017-11-061-0/+2
|\ \
| * | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-resultAndrey Okoshkin2017-10-211-0/+2
* | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-5/+5
|\ \ \ | |_|/ |/| |
| * | read-cache: drop explicit `CLOSE_LOCK`-flagMartin Ågren2017-10-071-5/+5
* | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-031-1/+4
|\ \ \ | |/ / |/| |
| * | git: add --no-optional-locks optionJeff King2017-09-271-1/+4
| |/
* | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-291-5/+10
|\ \
| * | builtin/commit: fix memory leak in `prepare_index()`Martin Ågren2017-09-241-5/+10
| |/
| * Merge branch 'ks/commit-abort-on-empty-message-fix' into maintJunio C Hamano2017-08-231-5/+5
| |\
* | | refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-241-2/+1
* | | add UNLEAK annotation for reducing leak false positivesJeff King2017-09-081-1/+2
* | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-1/+0
|\ \ \
| * | | submodule: remove gitmodules_configBrandon Williams2017-08-031-1/+0
* | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'Junio C Hamano2017-08-231-6/+9
|\ \ \ \
| * | | | commit: skip discarding the index if there is no pre-commit hookkw/commit-keep-index-when-pre-commit-is-not-runKevin Willford2017-08-161-6/+9
* | | | | Merge branch 'ks/commit-abort-on-empty-message-fix'Junio C Hamano2017-08-111-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | commit: check for empty message before the check for untouched templateks/commit-abort-on-empty-message-fixKaartic Sivaraam2017-07-171-5/+5
* | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-4/+4
| |_|/ |/| |
* | | Merge branch 'ks/typofix-commit-c-comment'Junio C Hamano2017-07-101-1/+1
|\ \ \ | |/ /
| * | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-commentKaartic Sivaraam2017-07-061-1/+1
* | | Merge branch 'ks/commit-assuming-only-warning-removal'Junio C Hamano2017-07-101-8/+1
|\ \ \
| * | | commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removalKaartic Sivaraam2017-06-301-2/+1
| * | | commit-template: remove outdated notice about explicit pathsKaartic Sivaraam2017-06-301-6/+0
* | | | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-301-0/+1
|\ \ \ \
| * | | | status: contextually notify user about an initial commitks/status-initial-commitKaartic Sivaraam2017-06-211-0/+1
| | |/ / | |/| |
* | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-261-0/+6
|\ \ \ \
| * | | | status: add optional stash count informationLiam Beguin2017-06-181-0/+6
* | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ \
| * | | | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-1/+2
|\ \ \ \ \
| * | | | | ls-files: convert overlay_tree_on_cache to take an indexBrandon Williams2017-06-131-1/+2
* | | | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | builtin/notes: convert to struct object_idbrian m. carlson2017-06-021-1/+1
| |/ / / /
* | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-4/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-261-4/+1
| |/ / /
* | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-181-1/+1
| |/ /
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-4/+4
|\ \ \
| * | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
| * | | Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-021-1/+1
| |/ /