summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/fopen-harder'Junio C Hamano2016-01-203-3/+3
|\
| * Handle more file writes correctly in shared reposjs/fopen-harderJohannes Schindelin2016-01-112-2/+2
| * commit: allow editing the commit message even in shared reposJohannes Schindelin2016-01-071-1/+1
| * Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-041-1/+1
| |\
* | \ Merge branch 'jk/clang-pedantic'Junio C Hamano2016-01-201-1/+1
|\ \ \
| * | | avoid shifting signed integers 31 bitsJeff King2016-01-041-1/+1
| |/ /
* | | Merge branch 'nd/ita-cleanup'Junio C Hamano2016-01-203-7/+2
|\ \ \
| * | | grep: make it clear i-t-a entries are ignoredNguyễn Thái Ngọc Duy2015-12-281-1/+1
| * | | add and use a convenience macro ce_intent_to_add()Nguyễn Thái Ngọc Duy2015-09-061-1/+1
| * | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-251-5/+0
* | | | Merge branch 'mh/notes-allow-reading-treeish'Junio C Hamano2016-01-201-13/+16
|\ \ \ \
| * | | | notes: allow treeish expressions as notes refmh/notes-allow-reading-treeishMike Hommey2016-01-121-13/+16
* | | | | Merge branch 'vl/grep-configurable-threads'Junio C Hamano2016-01-121-15/+31
|\ \ \ \ \
| * | | | | grep: add --threads=<num> option and grep.threads configurationvl/grep-configurable-threadsVictor Leschuk2015-12-161-13/+30
| * | | | | grep: slight refactoring to the code that disables threadingVictor Leschuk2015-12-151-2/+1
| * | | | | grep: allow threading even on a single-core machineVictor Leschuk2015-12-151-1/+1
* | | | | | Merge branch 'ea/blame-progress'Junio C Hamano2016-01-121-4/+30
|\ \ \ \ \ \
| * | | | | | blame: add support for --[no-]progress optionea/blame-progressEdmundo Carmona Antoranz2015-12-161-4/+30
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-111-16/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-115-37/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-042-2/+45
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano2016-01-122-1/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodules: allow parallel fetching, add tests and documentationStefan Beller2015-12-162-1/+11
* | | | | | | | | | Merge branch 'ps/push-delete-option'Junio C Hamano2016-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | push: add '-d' as shorthand for '--delete'ps/push-delete-optionPatrick Steinhardt2015-12-161-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/symbolic-ref-maint'Junio C Hamano2015-12-281-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-211-1/+1
* | | | | | | | | push: don't mark options of recurse-submodules for translationRalf Thielow2015-12-221-1/+1
* | | | | | | | | Merge branch 'bc/format-patch-null-from-line'Junio C Hamano2015-12-211-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: add an option to suppress commit hashbrian m. carlson2015-12-151-0/+5
* | | | | | | | | | Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-211-16/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | push: follow the "last one wins" convention for --recurse-submodulesmc/push-recurse-submodules-configMike Crowe2015-12-041-9/+3
| * | | | | | | | | push: add recurseSubmodules config optionMike Crowe2015-11-201-15/+24
* | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-12-1037-279/+281
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Remove get_object_hash.brian m. carlson2015-11-2027-107/+107
| * | | | | | | | | Convert struct object to object_idbrian m. carlson2015-11-2025-125/+125
| * | | | | | | | | Add several uses of get_object_hash.brian m. carlson2015-11-2026-109/+109
| * | | | | | | | | ref_newer: convert to use struct object_idbrian m. carlson2015-11-201-1/+1
| * | | | | | | | | add_sought_entry_mem: convert to struct object_idbrian m. carlson2015-11-201-6/+8
| * | | | | | | | | Convert struct ref to use object_id.brian m. carlson2015-11-206-43/+43
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dt/refs-backend-pre-vtable'Junio C Hamano2015-12-081-12/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | initdb: make safe_create_dir publicDavid Turner2015-11-201-12/+0
* | | | | | | | | | Merge branch 'rs/parseopt-short-help'Junio C Hamano2015-12-042-27/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-helpRené Scharfe2015-11-201-11/+1
| * | | | | | | | | | grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-201-16/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-011-16/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: fix object casting regressionJeff King2015-11-241-16/+14
* | | | | | | | | | | Merge branch 'maint'Jeff King2015-12-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-161-0/+3
| * | | | | | | | | Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-051-1/+1
| |\ \ \ \ \ \ \ \ \