aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
* lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
* try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty2014-10-01
* try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty2014-10-01
* Merge branch 'rs/realloc-array'Junio C Hamano2014-09-26
|\
| * use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe2014-09-18
* | Merge branch 'ah/grammofix'Junio C Hamano2014-09-19
|\ \ | |/ |/|
| * grammofix in user-facing messagesAlex Henrie2014-09-02
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-20
|/
* Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-16
|\
| * merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-10
* | Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \
| * | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
* | | Merge branch 'mg/verify-commit'Junio C Hamano2014-07-10
|\ \ \ | |_|/ |/| |
| * | gpg-interface: provide clear helper for struct signature_checkMichael J Gruber2014-06-23
* | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-02
|\ \ \ | |/ / |/| |
| * | commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-12
| |/
* | Merge branch 'fc/merge-default-to-upstream'Junio C Hamano2014-06-03
|\ \
| * | merge: enable defaulttoupstream by defaultFelipe Contreras2014-04-22
| |/
* | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-03
|\ \ | |/ |/|
| * refs.h: rename the action_on_err constantsMichael Haggerty2014-04-07
* | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-08
|\ \ | |/ |/|
| * parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-24
* | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-28
|\ \ | |/ |/|
| * merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
* | Merge branch 'nv/commit-gpgsign-config'Junio C Hamano2014-02-27
|\ \ | |/ |/|
| * commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier2014-02-24
* | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-27
|\ \
| * | prefer xwrite instead of writeErik Faye-Lund2014-01-17
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
|/ /
* | merge: simplify ff-only optionFelipe Contreras2013-10-31
|/
* Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-17
|\
| * use 'commit-ish' instead of 'committish'Richard Hansen2013-09-04
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
|/
* Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-22
|\
| * Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
* | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-15
|\ \
| * | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-02
| |/
* | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-12
|\ \ | |/ |/|
| * Change "remote tracking" to "remote-tracking"Michael Schubert2013-07-03
* | merge: use help_unknown_ref()Vikrant Varma2013-05-08
|/
* Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-05
|\
| * merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-31
| * merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-31
* | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-05
|\ \ | |/ |/|
| * merge: a random object may not necssarily be a commitJunio C Hamano2013-03-19
* | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-04
|\ \
| * | Allow custom "comment char"Junio C Hamano2013-01-16
* | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-10
|\ \ \ | |/ / |/| |