aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-10
|\
| * am -i: fix "v"iewJunio C Hamano2016-02-17
* | Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-10
|\ \
| * | rev-parse: take prefix into account in --git-common-dirNguyễn Thái Ngọc Duy2016-02-12
* | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-10
|\ \ \
| * | | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-10
| * | | checkout: reorder check_filename conditionalJeff King2016-02-10
* | | | Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-10
|\ \ \ \
| * | | | config: rename git_config_set_or_die to git_config_setPatrick Steinhardt2016-02-22
| * | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-22
| * | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-22
| * | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-22
| * | | | remote: die on config error when manipulating remotesPatrick Steinhardt2016-02-22
| * | | | remote: die on config error when setting/adding branchesPatrick Steinhardt2016-02-22
| * | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-22
| * | | | submodule--helper: die on config error when cloning modulePatrick Steinhardt2016-02-22
| * | | | branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-22
| * | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-22
* | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-22
|\ \ \ \ \
| * | | | | grep: make it clear i-t-a entries are ignoredNguyễn Thái Ngọc Duy2015-12-28
| * | | | | add and use a convenience macro ce_intent_to_add()Nguyễn Thái Ngọc Duy2015-09-06
| * | | | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-25
| | |/ / / | |/| | |
* | | | | Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | stripspace: call U+0020 a "space" instead of a "blank"Alex Henrie2016-01-29
| | |/ / | |/| |
* | | | Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-05
|\ \ \ \
| * | | | clean: make is_git_repository a public functionJeff King2016-01-25
| |/ / /
* | | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-05
|\ \ \ \
| * | | | diff: make -O and --output work in subdirectoryDuy Nguyen2016-01-21
| * | | | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-21
* | | | | Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-05
|\ \ \ \ \
| * | | | | tag: do not show ambiguous tag names as "tags/foo"Jeff King2016-01-26
| | |/ / / | |/| | |
* | | | | Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-05
|\ \ \ \ \
| * | | | | receive-pack: release pack files before garbage-collectingJohannes Schindelin2016-01-13
| * | | | | merge: release pack files before garbage-collectingJohannes Schindelin2016-01-13
| * | | | | am: release pack files before garbage-collectingJohannes Schindelin2016-01-13
| * | | | | fetch: release pack files before garbage-collectingJohannes Schindelin2016-01-13
| |/ / / /
* | | | | Merge branch 'js/fopen-harder' into maintJunio C Hamano2016-02-05
|\ \ \ \ \
| * | | | | Handle more file writes correctly in shared reposJohannes Schindelin2016-01-11
| * | | | | commit: allow editing the commit message even in shared reposJohannes Schindelin2016-01-07
| | |/ / / | |/| | |
| * | | | Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-04
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/clang-pedantic' into maintJunio C Hamano2016-02-05
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | avoid shifting signed integers 31 bitsJeff King2016-01-04
| |/ / / /
| * | | | Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-11
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-04
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/symbolic-ref-maint'Junio C Hamano2015-12-28
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-21
* | | | | | | | push: don't mark options of recurse-submodules for translationRalf Thielow2015-12-22
* | | | | | | | Merge branch 'bc/format-patch-null-from-line'Junio C Hamano2015-12-21
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: add an option to suppress commit hashbrian m. carlson2015-12-15