Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-05-06 | 4 | -16/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20] | brian m. carlson | 2016-04-25 | 4 | -16/+16 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-05-06 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | clone: add `--shallow-submodules` flag | Stefan Beller | 2016-04-26 | 1 | -0/+7 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'js/name-rev-use-oldest-ref' | Junio C Hamano | 2016-05-03 | 1 | -6/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-ref | Johannes Schindelin | 2016-04-22 | 1 | -6/+13 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'st/verify-tag' | Junio C Hamano | 2016-04-29 | 2 | -61/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | tag -v: verify directly rather than exec-ing verify-tag | Santiago Torres | 2016-04-22 | 1 | -7/+1 | |
| * | | | | | | | | | | | | | | verify-tag: move tag verification code to tag.c | Santiago Torres | 2016-04-22 | 1 | -54/+1 | |
| * | | | | | | | | | | | | | | verify-tag: prepare verify_tag for libification | Santiago Torres | 2016-04-22 | 1 | -9/+17 | |
| * | | | | | | | | | | | | | | verify-tag: update variable name and type | Santiago Torres | 2016-04-19 | 1 | -5/+6 | |
| * | | | | | | | | | | | | | | builtin/verify-tag.c: ignore SIGPIPE in gpg-interface | Santiago Torres | 2016-04-06 | 1 | -3/+0 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 2016-04-29 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-root | Junio C Hamano | 2016-04-21 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | Merge branch 'js/replace-edit-use-editor-configuration' | Junio C Hamano | 2016-04-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | replace --edit: respect core.editorjs/replace-edit-use-editor-configuration | Johannes Schindelin | 2016-04-20 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | Merge branch 'sb/mv-submodule-fix' | Junio C Hamano | 2016-04-29 | 1 | -9/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fix | Stefan Beller | 2016-04-19 | 1 | -9/+12 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2016-03-17 | 2 | -21/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2016-03-17 | 2 | -21/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'en/merge-trivial-fix' | Junio C Hamano | 2016-04-25 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fix | Elijah Newren | 2016-04-12 | 1 | -0/+8 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'dt/pre-refs-backend' | Junio C Hamano | 2016-04-25 | 4 | -7/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | check_aliased_update(): check that dst_name is non-NULL | Michael Haggerty | 2016-04-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | checkout_paths(): remove unneeded flag variable | Michael Haggerty | 2016-04-10 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | cmd_merge(): remove unneeded flag variable | Michael Haggerty | 2016-04-10 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | fsck_head_link(): remove unneeded flag variable | Michael Haggerty | 2016-04-10 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ad/commit-have-m-option' | Junio C Hamano | 2016-04-22 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-option | Jeff King | 2016-04-07 | 1 | -3/+3 | |
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' | Junio C Hamano | 2016-04-22 | 1 | -24/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | submodule--helper, module_clone: catch fprintf failuresb/submodule-helper-clone-regression-fix | Stefan Beller | 2016-04-01 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | submodule--helper: do not borrow absolute_path() result for too long | Junio C Hamano | 2016-04-01 | 1 | -5/+4 | |
| * | | | | | | | | | | | | | | | | | submodule--helper, module_clone: always operate on absolute paths | Stefan Beller | 2016-04-01 | 1 | -14/+14 | |
| * | | | | | | | | | | | | | | | | | submodule--helper clone: create the submodule path just once | Stefan Beller | 2016-03-31 | 1 | -4/+0 | |
| * | | | | | | | | | | | | | | | | | submodule--helper: fix potential NULL-dereference | Stefan Beller | 2016-03-31 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/branch-shortening-funny-symrefs' | Junio C Hamano | 2016-04-18 | 1 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefs | Jeff King | 2016-04-04 | 1 | -7/+12 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ky/branch-m-worktree' | Junio C Hamano | 2016-04-18 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | branch -m: update all per-worktree HEADs | Kazuki Yamaguchi | 2016-04-04 | 1 | -2/+1 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlf | Torsten Bögershausen | 2016-04-05 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | 1 | -3/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 | 1 | -0/+12 | |
| * | | | | | | | | | | | | | | | | | | | | git-pull.c: introduce git_pull_config() | Mehul Jain | 2016-03-21 | 1 | -3/+15 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/apply' | Junio C Hamano | 2016-04-13 | 1 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | builtin/apply: free patch when parse_chunk() failscc/apply | Christian Couder | 2016-04-01 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | builtin/apply: handle parse_binary() failure | Christian Couder | 2016-04-01 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name() | Junio C Hamano | 2016-03-22 | 1 | -6/+0 |