aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'ad/commit-have-m-option'Junio C Hamano2016-04-22
|\
| * commit: do not ignore an empty message given by -m ''Jeff King2016-04-07
* | Merge branch 'sb/submodule-helper-clone-regression-fix'Junio C Hamano2016-04-22
|\ \
| * | submodule--helper, module_clone: catch fprintf failureStefan Beller2016-04-01
| * | submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano2016-04-01
| * | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-01
| * | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-31
| * | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-31
* | | Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-18
|\ \ \
| * | | branch: fix shortening of non-remote symrefsJeff King2016-04-04
* | | | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-18
|\ \ \ \
| * | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-04
* | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-13
|\ \ \ \ \
| * | | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
| | |_|_|/ | |/| | |
* | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-13
|\ \ \ \ \
| * | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-30
* | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-13
|\ \ \ \ \ \
| * | | | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-21
| * | | | | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-21
* | | | | | | Merge branch 'cc/apply'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \
| * | | | | | | builtin/apply: free patch when parse_chunk() failsChristian Couder2016-04-01
| * | | | | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-01
| * | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-22
| * | | | | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-22
| |/ / / / / /
* | | | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \
| * | | | | | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-01
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sk/send-pack-all-fix'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \
| * | | | | | | git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2016-03-31
* | | | | | | | Merge branch 'ky/branch-d-worktree'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | branch -d: refuse deleting a branch which is currently checked outKazuki Yamaguchi2016-03-29
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | worktree: add: introduce --checkout optionRay Zhang2016-03-29
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jk/check-repository-format'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | init: use setup.c's repo version verificationJeff King2016-03-11
| * | | | | | | | wrap shared_repository global in get/set accessorsJeff King2016-03-11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/apply-report-skip'Junio C Hamano2016-04-08
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: report patch skipping in verbose modeNguyễn Thái Ngọc Duy2016-03-24
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-08
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-23
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: add the option to force signing of annotated tagsLaurent Arnoud2016-03-22
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \
| * | | | | | | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-01
| * | | | | | | | submodule: fix segmentation fault in submodule--helper cloneJacob Keller2016-03-01
| * | | | | | | | submodule: fix submodule--helper clone usageJacob Keller2016-03-01
| * | | | | | | | submodule: check argc count for git submodule--helper cloneJacob Keller2016-03-01
* | | | | | | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7Junio C Hamano2016-03-16
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6Junio C Hamano2016-03-16
| | |\ \ \ \ \ \ \