Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | status: respect "-b" for porcelain format | Jeff King | 2012-05-08 | 1 | -5/+4 |
* | status: refactor null_termination option | Jeff King | 2012-05-08 | 1 | -9/+8 |
* | commit: refactor option parsing | Jeff King | 2012-05-08 | 1 | -58/+59 |
* | Merge branch 'jc/commit-unedited-template' into maint | Junio C Hamano | 2012-04-26 | 1 | -19/+43 |
|\ | |||||
| * | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 | 1 | -19/+41 |
| * | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 | 1 | -0/+2 |
* | | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 | 1 | -3/+19 |
|\ \ | |||||
| * | | commit: pass author/committer info to hooksjc/commit-hook-authorship | Junio C Hamano | 2012-03-11 | 1 | -3/+19 |
| * | | Merge branch 'jx/i18n-more-marking' into maint | Junio C Hamano | 2012-02-16 | 1 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/parse-date-raw' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+6 |
| |\ \ \ | | |_|/ | |/| | | |||||
* | | | | Merge branch 'nd/cache-tree-api-refactor' | Junio C Hamano | 2012-02-12 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactor | Nguyễn Thái Ngọc Duy | 2012-02-07 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jc/parse-date-raw' | Junio C Hamano | 2012-02-10 | 1 | -0/+6 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | parse_date(): '@' prefix forces git-timestampjc/parse-date-raw | Junio C Hamano | 2012-02-03 | 1 | -0/+6 |
* | | | i18n: git-commit whence_s "merge/cherry-pick" message | Jiang Xin | 2012-02-01 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 1 | -2/+12 |
|\ \ | |||||
| * | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 1 | -1/+2 |
| * | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-05 | 1 | -1/+10 |
| |\ \ | |||||
| | * | | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 | 1 | -1/+10 |
* | | | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init | Junio C Hamano | 2011-12-18 | 1 | -1/+1 |
* | | | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 | 1 | -1/+1 |
* | | | | | | Sync with v1.7.8.1 | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-20 | 1 | -1/+5 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | commit: do not lose mergetag header when not amending | Junio C Hamano | 2011-12-20 | 1 | -1/+5 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-ref | Nguyễn Thái Ngọc Duy | 2011-12-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-19 | 1 | -4/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: write cache-tree data when writing index anyway | Thomas Rast | 2011-12-06 | 1 | -0/+2 |
| * | | | | | | Refactor cache_tree_update idiom from commit | Thomas Rast | 2011-12-06 | 1 | -4/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/commit-amend-no-edit' | Junio C Hamano | 2011-12-16 | 1 | -4/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | commit: honour --no-edit | Junio C Hamano | 2011-12-08 | 1 | -4/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-09 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Copy resolve_ref() return value for longer use | Nguyễn Thái Ngọc Duy | 2011-12-05 | 1 | -1/+2 |
* | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-09 | 1 | -7/+12 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | commit: teach --amend to carry forward extra headers | Junio C Hamano | 2011-11-09 | 1 | -2/+7 |
| * | | | | commit: copy merged signed tags to headers of merge commit | Junio C Hamano | 2011-11-09 | 1 | -5/+5 |
| |/ / / | |||||
* | | | | revert: write REVERT_HEAD pseudoref during conflicted revert | Jonathan Nieder | 2011-11-22 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge branch 'nd/maint-autofix-tag-in-head' | Junio C Hamano | 2011-10-13 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | Accept tags in HEAD or MERGE_HEAD | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -2/+4 |
* | | | | Merge branch 'cb/common-prefix-unification' | Junio C Hamano | 2011-10-10 | 1 | -2/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | rename pathspec_prefix() to common_prefix() and move to dir.[ch] | Clemens Buchacher | 2011-09-12 | 1 | -1/+1 |
| * | | | remove prefix argument from pathspec_prefix | Clemens Buchacher | 2011-09-06 | 1 | -2/+3 |
* | | | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 1 | -11/+2 |
|\ \ \ \ | |||||
| * | | | | want_color: automatically fallback to color.ui | Jeff King | 2011-08-19 | 1 | -10/+1 |
| * | | | | git_config_colorbool: refactor stdout_is_tty handling | Jeff King | 2011-08-18 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/maint-autofix-tag-in-head' | Junio C Hamano | 2011-08-25 | 1 | -42/+45 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | commit: reduce use of redundant global variables | Junio C Hamano | 2011-08-19 | 1 | -42/+45 |
| |/ / / |