Age | Commit message (Expand) | Author | Files | Lines |
2012-05-24 | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT | Jeff King | 1 | -2/+2 |
2012-04-27 | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 1 | -54/+88 |
2012-04-17 | builtin/merge.c: reduce parents early | Junio C Hamano | 1 | -25/+40 |
2012-04-17 | builtin/merge.c: collect other parents early | Junio C Hamano | 1 | -13/+27 |
2012-04-17 | builtin/merge.c: remove "remoteheads" global variable | Junio C Hamano | 1 | -23/+28 |
2012-04-02 | Sync with 1.7.9.6 | Junio C Hamano | 1 | -4/+1 |
2012-03-20 | merge: backport GIT_MERGE_AUTOEDIT support | Junio C Hamano | 1 | -1/+28 |
2012-03-06 | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 1 | -0/+2 |
2012-03-01 | diff --stat: add config option to limit graph width | Zbigniew Jędrzejewski-Szmek | 1 | -0/+1 |
2012-03-01 | merge --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 1 | -0/+1 |
2012-02-27 | Merge branch 'tr/merge-edit-guidance' into maint | Junio C Hamano | 1 | -0/+10 |
2012-02-23 | merge: do not trust fstat(2) too much when checking interactiveness | Junio C Hamano | 1 | -1/+1 |
2012-02-12 | Merge branch 'jn/merge-no-edit-fix' | Junio C Hamano | 1 | -1/+2 |
2012-02-10 | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' | Junio C Hamano | 1 | -1/+2 |
2012-02-09 | merge: do not launch an editor on "--no-edit $tag" | Junio C Hamano | 1 | -3/+7 |
2012-02-05 | merge: do not create a signed tag merge under --ff-only option | Junio C Hamano | 1 | -1/+2 |
2012-01-31 | Merge branch 'tr/merge-edit-guidance' | Junio C Hamano | 1 | -0/+10 |
2012-01-31 | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 1 | -4/+34 |
2012-01-31 | merge: add instructions to the commit message when editing | Thomas Rast | 1 | -0/+10 |
2012-01-23 | merge: use editor by default in interactive sessions | Junio C Hamano | 1 | -4/+34 |
2012-01-06 | Merge branch 'jc/show-sig' | Junio C Hamano | 1 | -2/+12 |
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 |