Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pseudoref: check return values from read_ref()dt/refs-pseudo | David Turner | 2015-08-11 | 1 | -2/+5 |
* | sequencer: replace write_cherry_pick_head with update_ref | David Turner | 2015-07-31 | 1 | -19/+4 |
* | bisect: use update_ref | David Turner | 2015-07-31 | 1 | -29/+8 |
* | pseudorefs: create and use pseudoref update and delete functions | David Turner | 2015-07-31 | 1 | -8/+93 |
* | refs: add ref_type function | David Turner | 2015-07-31 | 2 | -0/+34 |
* | refs: introduce pseudoref and per-worktree ref concepts | David Turner | 2015-07-31 | 1 | -0/+21 |
* | git-stash: use update-ref --create-reflog instead of creating filesdt/refs-backend-preamble | David Turner | 2015-07-21 | 1 | -4/+2 |
* | update-ref and tag: add --create-reflog arg | David Turner | 2015-07-21 | 6 | -7/+74 |
* | refs: add REF_FORCE_CREATE_REFLOG flag | David Turner | 2015-07-21 | 2 | -13/+22 |
* | git-reflog: add exists command | David Turner | 2015-07-21 | 3 | -1/+41 |
* | refs: new public ref function: safe_create_reflog | David Turner | 2015-07-21 | 3 | -14/+26 |
* | refs: break out check for reflog autocreation | David Turner | 2015-07-21 | 1 | -5/+11 |
* | refs.c: add err arguments to reflog functions | David Turner | 2015-07-21 | 3 | -60/+81 |
* | Sync with maint | Junio C Hamano | 2015-06-28 | 0 | -0/+0 |
|\ | |||||
| * | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-06-25 | 2 | -9/+0 |
| |\ | |||||
| * \ | Merge branch 'cb/array-size' into maint | Junio C Hamano | 2015-06-25 | 1 | -5/+3 |
| |\ \ | |||||
* | | | | Git 2.5.0-rc0v2.5.0-rc0 | Junio C Hamano | 2015-06-25 | 2 | -16/+3 |
* | | | | Merge branch 'cn/cvsimport-perl-update' | Junio C Hamano | 2015-06-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | cvsimport: silence regex warning appearing in Perl 5.22.cn/cvsimport-perl-update | Christian Neukirchen | 2015-06-24 | 1 | -1/+1 |
* | | | | | Merge branch 'cb/array-size' | Junio C Hamano | 2015-06-25 | 1 | -5/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-size | Charles Bailey | 2015-06-24 | 1 | -5/+3 |
* | | | | | Sync with 2.4.5 | Junio C Hamano | 2015-06-25 | 2 | -1/+30 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Git 2.4.5v2.4.5 | Junio C Hamano | 2015-06-25 | 4 | -3/+32 |
| * | | | | Merge branch 'sg/merge-summary-config' into maint | Junio C Hamano | 2015-06-25 | 3 | -16/+12 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/make-fix-dependencies' into maint | Junio C Hamano | 2015-06-25 | 1 | -24/+25 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sb/pack-protocol-mention-smart-http' into maint | Junio C Hamano | 2015-06-25 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/die-on-bogus-worktree-late' into maint | Junio C Hamano | 2015-06-25 | 2 | -10/+26 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'pt/pull-tags-error-diag' into maint | Junio C Hamano | 2015-06-25 | 1 | -9/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 5 | -22/+23 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diagnose-config-mmap-failure' into maint | Junio C Hamano | 2015-06-25 | 4 | -11/+29 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint | Junio C Hamano | 2015-06-25 | 7 | -9/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/rebase-i-post-rewrite-exec' into maint | Junio C Hamano | 2015-06-25 | 2 | -41/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-06-25 | 4 | -38/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-a | Junio C Hamano | 2015-06-23 | 4 | -38/+8 |
* | | | | | | | | | | | | | | | Ninth batch for 2.5 | Junio C Hamano | 2015-06-24 | 1 | -39/+102 |
* | | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' | Junio C Hamano | 2015-06-24 | 2 | -9/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-index | Jeff King | 2015-06-15 | 2 | -9/+0 |
* | | | | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osx | Panagiotis Astithas | 2015-06-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanity | Paul Tan | 2015-06-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-changes-block-size' | Junio C Hamano | 2015-06-24 | 3 | -31/+165 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | git-p4: fixing --changes-block-size handlingld/p4-changes-block-size | Luke Diamand | 2015-06-10 | 2 | -28/+69 |
| * | | | | | | | | | | | | | | | | | git-p4: add tests for non-numeric revision range | Luke Diamand | 2015-06-10 | 1 | -0/+38 |
| * | | | | | | | | | | | | | | | | | git-p4: test with limited p4 server results | Luke Diamand | 2015-06-08 | 1 | -6/+23 |
| * | | | | | | | | | | | | | | | | | git-p4: additional testing of --changes-block-size | Luke Diamand | 2015-06-08 | 1 | -9/+47 |
* | | | | | | | | | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vn | Frans Klaver | 2015-06-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/commit-cleanup-scissors' | Junio C Hamano | 2015-06-24 | 2 | -5/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissors | SZEDER Gábor | 2015-06-09 | 2 | -5/+28 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |