Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remote rm: handle symbolic refs correctly | Michael Haggerty | 2016-06-20 | 1 | -5/+1 |
* | delete_refs(): add a flags argument | Michael Haggerty | 2016-06-20 | 2 | -3/+3 |
* | delete_branches(): use resolve_refdup() | Michael Haggerty | 2016-06-13 | 1 | -8/+11 |
* | 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 |
| * | | | | | | | | | builtin/apply: get rid of useless 'name' variable | Christian Couder | 2016-03-22 | 1 | -8/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 2016-04-13 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | notes: don't leak memory in git_config_get_notes_strategy | Stefan Beller | 2016-04-01 | 1 | -2/+3 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sk/send-pack-all-fix' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fix | Stanislav Kolotinskiy | 2016-03-31 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ky/branch-d-worktree' | Junio C Hamano | 2016-04-13 | 1 | -8/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktree | Kazuki Yamaguchi | 2016-03-29 | 1 | -8/+14 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rz/worktree-no-checkout' | Junio C Hamano | 2016-04-13 | 1 | -11/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkout | Ray Zhang | 2016-03-29 | 1 | -11/+18 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/check-repository-format' | Junio C Hamano | 2016-04-13 | 1 | -21/+24 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | init: use setup.c's repo version verification | Jeff King | 2016-03-11 | 1 | -9/+12 |
| * | | | | | | | | wrap shared_repository global in get/set accessors | Jeff King | 2016-03-11 | 1 | -12/+12 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/apply-report-skip' | Junio C Hamano | 2016-04-08 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply: report patch skipping in verbose modend/apply-report-skip | Nguyễn Thái Ngọc Duy | 2016-03-24 | 1 | -0/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 2016-04-08 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 | 1 | -3/+9 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'la/tag-force-signing-annotated-tags' | Junio C Hamano | 2016-04-06 | 1 | -6/+14 |
|\ \ \ \ \ \ \ \ |