summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/apply-report-skip'Junio C Hamano2016-04-081-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: report patch skipping in verbose modend/apply-report-skipNguyễn Thái Ngọc Duy2016-03-241-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-081-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-3/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-061-6/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-221-6/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-061-3/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-011-1/+67
| * | | | | | | | submodule: fix segmentation fault in submodule--helper cloneJacob Keller2016-03-011-3/+3
| * | | | | | | | submodule: fix submodule--helper clone usageJacob Keller2016-03-011-1/+1
| * | | | | | | | submodule: check argc count for git submodule--helper cloneJacob Keller2016-03-011-0/+4
* | | | | | | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-061-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-5/+5
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-162-21/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-162-21/+6
| | |\ \ \ \ \ \ \
View Lorry Controller Status