summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-291-0/+6
|\
| * pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-0/+6
* | Merge branch 'js/replace-edit-use-editor-configuration'Junio C Hamano2016-04-291-0/+1
|\ \
| * | replace --edit: respect core.editorjs/replace-edit-use-editor-configurationJohannes Schindelin2016-04-201-0/+1
* | | Merge branch 'sb/mv-submodule-fix'Junio C Hamano2016-04-291-9/+12
|\ \ \
| * | | mv: allow moving nested submodulessb/mv-submodule-fixStefan Beller2016-04-191-9/+12
| |/ /
| * | Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-172-21/+6
| |\ \
| | * \ Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-172-21/+6
| | |\ \
* | | \ \ Merge branch 'en/merge-trivial-fix'Junio C Hamano2016-04-251-0/+8
|\ \ \ \ \
| * | | | | builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fixElijah Newren2016-04-121-0/+8
* | | | | | Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-254-7/+5
|\ \ \ \ \ \
| * | | | | | check_aliased_update(): check that dst_name is non-NULLMichael Haggerty2016-04-101-1/+1
| * | | | | | checkout_paths(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+1
| * | | | | | cmd_merge(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+2
| * | | | | | fsck_head_link(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+1
* | | | | | | Merge branch 'ad/commit-have-m-option'Junio C Hamano2016-04-221-3/+3
|\ \ \ \ \ \ \
| * | | | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-071-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix'Junio C Hamano2016-04-221-24/+16
|\ \ \ \ \ \ \
| * | | | | | | submodule--helper, module_clone: catch fprintf failuresb/submodule-helper-clone-regression-fixStefan Beller2016-04-011-2/+2
| * | | | | | | submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano2016-04-011-5/+4
| * | | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-011-14/+14
| * | | | | | | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-311-4/+0
| * | | | | | | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-311-4/+4
* | | | | | | | Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-181-7/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-7/+12
* | | | | | | | | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-181-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-2/+1
* | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-131-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-131-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-301-0/+1
* | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-131-3/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-211-0/+12
| * | | | | | | | | | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-211-3/+15
* | | | | | | | | | | | Merge branch 'cc/apply'Junio C Hamano2016-04-131-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/apply: free patch when parse_chunk() failscc/applyChristian Couder2016-04-011-1/+3
| * | | | | | | | | | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-011-0/+7
| * | | | | | | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-221-6/+0
| * | | | | | | | | | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-221-8/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-131-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-011-2/+3
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sk/send-pack-all-fix'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fixStanislav Kolotinskiy2016-03-311-1/+1
* | | | | | | | | | | | | Merge branch 'ky/branch-d-worktree'Junio C Hamano2016-04-131-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-8/+14
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-131-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkoutRay Zhang2016-03-291-11/+18
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/check-repository-format'Junio C Hamano2016-04-131-21/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | / / / / | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | init: use setup.c's repo version verificationJeff King2016-03-111-9/+12
| * | | | | | | | | | | wrap shared_repository global in get/set accessorsJeff King2016-03-111-12/+12
| | |_|_|/ / / / / / / | |/| | | | | | | | |