Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 |
|\ | |||
| * | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 |
* | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 |
|\ \ | |||
| * | | Update jk/maint-strbuf-missing-init to builtin/ rename | Junio C Hamano | 2011-12-18 |
* | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 |
|\ \ \ | |||
| * | | | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 |
| * | | | merge: abort if fails to commit | Nguyễn Thái Ngọc Duy | 2011-12-15 |
* | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-19 |
|\ \ \ \ | |||
| * | | | | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 2011-12-13 |
* | | | | | Merge branch 'nd/ignore-might-be-precious' | Junio C Hamano | 2011-12-13 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore | Nguyễn Thái Ngọc Duy | 2011-11-28 |
| * | | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious | Junio C Hamano | 2011-11-28 |
| |\ \ \ \ | | |/ / / | |/| | | | |||
* | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-09 |
|\ \ \ \ \ | |||
| * | | | | | Copy resolve_ref() return value for longer use | Nguyễn Thái Ngọc Duy | 2011-12-05 |
| * | | | | | Convert many resolve_ref() calls to read_ref*() and ref_exists() | Nguyễn Thái Ngọc Duy | 2011-11-13 |
* | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-09 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | merge: force edit and no-ff mode when merging a tag object | Junio C Hamano | 2011-11-09 |
| * | | | | | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 |
| * | | | | | merge: make usage of commit->util more extensible | Junio C Hamano | 2011-11-08 |
| * | | | | | fmt-merge-msg: package options into a structure | Junio C Hamano | 2011-11-07 |
| * | | | | | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 |
| |/ / / / | |||
* | | | | | Merge branch 'jc/request-pull-show-head-4' | Junio C Hamano | 2011-12-09 |
|\ \ \ \ \ | |||
| * | | | | | fmt-merge-msg: use branch.$name.description | Junio C Hamano | 2011-10-07 |
* | | | | | | Merge branch 'nd/maint-ignore-exclude' | Junio C Hamano | 2011-12-05 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| * | | | | | checkout,merge: loosen overwriting untracked file check based on info/exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 |
* | | | | | | Merge branch 'vr/git-merge-default-to-upstream' | Junio C Hamano | 2011-12-05 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||
| * | | | | | Show error for 'git merge' with unset merge.defaultToUpstream | Vincent van Ravesteijn | 2011-11-21 |
| * | | | | | Merge branch 'nd/maint-autofix-tag-in-head' into maint | Junio C Hamano | 2011-10-21 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||
* | | | | | | do not let git_path clobber errno when reporting errors | Jonathan Nieder | 2011-11-17 |
| |_|_|/ / |/| | | | | |||
* | | | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 |
|\ \ \ \ \ | |||
| * | | | | | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 |
| |/ / / / | |||
* | | | | | Merge branch 'nd/maint-autofix-tag-in-head' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Accept tags in HEAD or MERGE_HEAD | Nguyễn Thái Ngọc Duy | 2011-09-18 |
| * | | | | merge: remove global variable head[] | Nguyễn Thái Ngọc Duy | 2011-09-18 |
| * | | | | merge: use return value of resolve_ref() to determine if HEAD is invalid | Nguyễn Thái Ngọc Duy | 2011-09-18 |
| * | | | | merge: keep stash[] a local variable | Nguyễn Thái Ngọc Duy | 2011-08-26 |
* | | | | | Merge branch 'jc/want-commit' | Junio C Hamano | 2011-10-05 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | Allow git merge ":/<pattern>" | Junio C Hamano | 2011-09-15 |
| |/ / / | |||
* | | | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 |
|\ \ \ \ | |||
| * | | | | want_color: automatically fallback to color.ui | Jeff King | 2011-08-19 |
| * | | | | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 |
| |/ / / | |||
* | | | | Merge branch 'jc/merge-reword' | Junio C Hamano | 2011-08-25 |
|\ \ \ \ | |/ / / |/| | | | |||
| * | | | merge: reword the final message | Junio C Hamano | 2011-05-25 |
* | | | | Merge branch 'jk/format-patch-am' | Junio C Hamano | 2011-05-31 |
|\ \ \ \ | |/ / / |/| | | | |||
| * | | | clean up calling conventions for pretty.c functions | Jeff King | 2011-05-26 |
* | | | | Merge branch 'jk/cherry-pick-root-with-resolve' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ | |||
| * | | | | cherry-pick: handle root commits with external strategies | Jeff King | 2011-05-16 |
* | | | | | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ | |||
| * | | | | | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 |
| * | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 |
| |/ / / / |