| Commit message (Expand) | Author | Age |
* | Merge branch 'jc/merge' | Junio C Hamano | 2015-05-19 |
|\ |
|
| * | merge: deprecate 'git merge <message> HEAD <commit>' syntax | Junio C Hamano | 2015-04-29 |
| * | merge: handle FETCH_HEAD internally | Junio C Hamano | 2015-04-29 |
| * | merge: decide if we auto-generate the message early in collect_parents() | Junio C Hamano | 2015-04-29 |
| * | merge: make collect_parents() auto-generate the merge message | Junio C Hamano | 2015-04-29 |
| * | merge: extract prepare_merge_message() logic out | Junio C Hamano | 2015-04-29 |
| * | merge: narrow scope of merge_names | Junio C Hamano | 2015-04-29 |
| * | merge: split reduce_parents() out of collect_parents() | Junio C Hamano | 2015-04-29 |
| * | merge: clarify collect_parents() logic | Junio C Hamano | 2015-04-29 |
| * | merge: small leakfix and code simplification | Junio C Hamano | 2015-04-29 |
| * | merge: do not check argc to determine number of remote heads | Junio C Hamano | 2015-04-29 |
| * | merge: clarify "pulling into void" special case | Junio C Hamano | 2015-04-29 |
| * | merge: simplify code flow | Junio C Hamano | 2015-04-29 |
* | | Revert "merge: pass verbosity flag down to merge-recursive" | Junio C Hamano | 2015-04-16 |
* | | Merge branch 'jk/merge-quiet' | Junio C Hamano | 2015-04-14 |
|\ \ |
|
| * | | merge: pass verbosity flag down to merge-recursive | Jeff King | 2015-04-02 |
* | | | standardize usage info string format | Alex Henrie | 2015-01-14 |
* | | | Merge branch 'rs/plug-strbuf-leak-in-merge' | Junio C Hamano | 2015-01-12 |
|\ \ \ |
|
| * | | | merge: release strbuf after use in suggest_conflicts() | René Scharfe | 2014-12-29 |
* | | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2015-01-07 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | get_merge_bases(): always clean-up object flags | Junio C Hamano | 2014-10-30 |
| |/ / |
|
* | | | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 |
| |\ \ |
|
| | * | | merge & sequencer: unify codepaths that write "Conflicts:" hint | Junio C Hamano | 2014-10-24 |
| | * | | builtin/merge.c: drop a parameter that is never used | Junio C Hamano | 2014-10-24 |
* | | | | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 2014-10-15 |
* | | | | lockfile.h: extract new header file for the functions in lockfile.c | Michael Haggerty | 2014-10-01 |
* | | | | try_merge_strategy(): use a statically-allocated lock_file object | Michael Haggerty | 2014-10-01 |
* | | | | try_merge_strategy(): remove redundant lock_file allocation | Michael Haggerty | 2014-10-01 |
* | | | | Merge branch 'rs/realloc-array' | Junio C Hamano | 2014-09-26 |
|\ \ \ \ |
|
| * | | | | use REALLOC_ARRAY for changing the allocation size of arrays | René Scharfe | 2014-09-18 |
| |/ / / |
|
* | | | | Merge branch 'ah/grammofix' | Junio C Hamano | 2014-09-19 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | grammofix in user-facing messages | Alex Henrie | 2014-09-02 |
* | | | | run-command: introduce CHILD_PROCESS_INIT | René Scharfe | 2014-08-20 |
|/ / / |
|
* | | | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-16 |
|\ \ \ |
|
| * | | | merge: simplify merge_trivial() by using commit_list_append() | René Scharfe | 2014-07-10 |
* | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 |
|\ \ \ \ |
|
| * | | | | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 2014-06-13 |
* | | | | | Merge branch 'mg/verify-commit' | Junio C Hamano | 2014-07-10 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | gpg-interface: provide clear helper for struct signature_check | Michael J Gruber | 2014-06-23 |
* | | | | | Merge branch 'jk/commit-buffer-length' | Junio C Hamano | 2014-07-02 |
|\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | commit_tree: take a pointer/len pair rather than a const strbuf | Jeff King | 2014-06-12 |
| |/ / |
|
* | | | Merge branch 'fc/merge-default-to-upstream' | Junio C Hamano | 2014-06-03 |
|\ \ \ |
|
| * | | | merge: enable defaulttoupstream by default | Felipe Contreras | 2014-04-22 |
| |/ / |
|
* | | | Merge branch 'mh/ref-transaction' | Junio C Hamano | 2014-06-03 |
|\ \ \
| |/ /
|/| | |
|
| * | | refs.h: rename the action_on_err constants | Michael Haggerty | 2014-04-07 |
* | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 |
|\ \ \
| |/ /
|/| | |
|
| * | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 |
* | | | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 |
|\ \ \
| |/ /
|/| | |
|
| * | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 |