| Commit message (Expand) | Author | Age | Files | Lines |
* | log-tree.c: small refactor in show_signature() | Junio C Hamano | 2012-01-05 | 1 | -12/+16 |
* | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 4 | -8/+36 |
* | verify_signed_buffer: fix stale comment | Junio C Hamano | 2012-01-05 | 1 | -4/+1 |
* | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-05 | 15 | -19/+364 |
|\ |
|
| * | gpg-interface: allow use of a custom GPG binaryjc/signed-commit | Junio C Hamano | 2011-11-29 | 3 | -6/+24 |
| * | pretty: %G[?GS] placeholders | Junio C Hamano | 2011-11-12 | 1 | -0/+86 |
| * | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 | 1 | -0/+71 |
| * | log: --show-signature | Junio C Hamano | 2011-11-12 | 5 | -0/+88 |
| * | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 | 7 | -13/+95 |
* | | commit: do not lose mergetag header when not amending | Junio C Hamano | 2011-12-20 | 1 | -1/+5 |
|/ |
|
* | commit-tree: teach -m/-F options to read logs from elsewhere | Junio C Hamano | 2011-11-12 | 2 | -6/+53 |
* | commit-tree: update the command line parsing | Junio C Hamano | 2011-11-09 | 1 | -13/+18 |
* | commit: teach --amend to carry forward extra headers | Junio C Hamano | 2011-11-09 | 3 | -3/+76 |
* | merge: force edit and no-ff mode when merging a tag object | Junio C Hamano | 2011-11-09 | 1 | -0/+6 |
* | commit: copy merged signed tags to headers of merge commit | Junio C Hamano | 2011-11-09 | 3 | -11/+116 |
* | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 | 2 | -4/+15 |
* | merge: make usage of commit->util more extensible | Junio C Hamano | 2011-11-08 | 4 | -47/+61 |
* | fmt-merge-msg: Add contents of merged tag in the merge message | Junio C Hamano | 2011-11-08 | 3 | -2/+92 |
* | fmt-merge-msg: package options into a structure | Junio C Hamano | 2011-11-07 | 3 | -18/+27 |
* | fmt-merge-msg: avoid early returns | Junio C Hamano | 2011-11-07 | 1 | -10/+10 |
* | refs DWIMmery: use the same rule for both "git fetch" and others | Junio C Hamano | 2011-11-07 | 3 | -12/+3 |
* | fetch: allow "git fetch $there v1.0" to fetch a tag | Junio C Hamano | 2011-11-07 | 1 | -0/+1 |
* | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 | 5 | -8/+13 |
* | fetch: do not store peeled tag object names in FETCH_HEAD | Linus Torvalds | 2011-11-04 | 59 | -176/+175 |
* | Split GPG interface into its own helper library | Junio C Hamano | 2011-11-04 | 6 | -100/+166 |
* | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 | 3 | -39/+99 |
|\ |
|
| * | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 | 3 | -39/+99 |
* | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 6 | -16/+175 |
|\ \ |
|
| * | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 6 | -6/+154 |
| * | | xdiff: factor out get_func_line() | René Scharfe | 2011-10-10 | 1 | -16/+27 |
| |/ |
|
* | | Merge branch 'rs/pickaxe' | Junio C Hamano | 2011-10-19 | 1 | -108/+70 |
|\ \ |
|
| * | | pickaxe: factor out pickaxers/pickaxe | René Scharfe | 2011-10-07 | 1 | -67/+43 |
| * | | pickaxe: give diff_grep the same signature as has_changes | René Scharfe | 2011-10-07 | 1 | -3/+4 |
| * | | pickaxe: pass diff_options to contains and has_changes | René Scharfe | 2011-10-07 | 1 | -14/+14 |
| * | | pickaxe: factor out has_changes | René Scharfe | 2011-10-07 | 1 | -36/+21 |
| * | | pickaxe: plug regex/kws leak | René Scharfe | 2011-10-07 | 1 | -6/+7 |
| * | | pickaxe: plug regex leak | René Scharfe | 2011-10-07 | 1 | -7/+6 |
| * | | pickaxe: plug diff filespec leak with empty needle | René Scharfe | 2011-10-07 | 1 | -2/+2 |
| |/ |
|
* | | Merge branch 'js/no-cherry-pick-head-after-punted' | Junio C Hamano | 2011-10-19 | 2 | -7/+31 |
|\ \ |
|
| * \ | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... | Junio C Hamano | 2011-10-06 | 2 | -7/+31 |
| |\ \ |
|
| | * | | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-punted | Jay Soffian | 2011-10-06 | 1 | -5/+7 |
| | * | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 | 2 | -2/+24 |
* | | | | Merge branch 'bk/submodule-in-recursive-merge' | Junio C Hamano | 2011-10-19 | 4 | -4/+61 |
|\ \ \ \ |
|
| * | | | | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 4 | -5/+11 |
| * | | | | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 | 1 | -0/+51 |
* | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 | 2 | -0/+46 |
|\ \ \ \ \ |
|
| * | | | | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 2 | -0/+46 |
* | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-19 | 1 | -12/+7 |
|\ \ \ \ \ \ |
|
| * | | | | | | t1300: attempting to remove a non-existent .git/config is not an error | Johannes Sixt | 2011-10-19 | 1 | -12/+7 |
* | | | | | | | Merge branch 'js/log-show-children' | Junio C Hamano | 2011-10-18 | 1 | -0/+12 |
|\ \ \ \ \ \ \ |
|