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