Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/fopen-harder' | Junio C Hamano | 2016-01-20 | 3 | -3/+3 |
|\ | |||||
| * | Handle more file writes correctly in shared reposjs/fopen-harder | Johannes Schindelin | 2016-01-11 | 2 | -2/+2 |
| * | commit: allow editing the commit message even in shared repos | Johannes Schindelin | 2016-01-07 | 1 | -1/+1 |
| * | Merge branch 'jk/symbolic-ref-maint' into maint | Junio C Hamano | 2016-01-04 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge branch 'jk/clang-pedantic' | Junio C Hamano | 2016-01-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | avoid shifting signed integers 31 bits | Jeff King | 2016-01-04 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'nd/ita-cleanup' | Junio C Hamano | 2016-01-20 | 3 | -7/+2 |
|\ \ \ | |||||
| * | | | grep: make it clear i-t-a entries are ignored | Nguyễn Thái Ngọc Duy | 2015-12-28 | 1 | -1/+1 |
| * | | | add and use a convenience macro ce_intent_to_add() | Nguyễn Thái Ngọc Duy | 2015-09-06 | 1 | -1/+1 |
| * | | | blame: remove obsolete comment | Nguyễn Thái Ngọc Duy | 2015-08-25 | 1 | -5/+0 |
* | | | | Merge branch 'mh/notes-allow-reading-treeish' | Junio C Hamano | 2016-01-20 | 1 | -13/+16 |
|\ \ \ \ | |||||
| * | | | | notes: allow treeish expressions as notes refmh/notes-allow-reading-treeish | Mike Hommey | 2016-01-12 | 1 | -13/+16 |
* | | | | | Merge branch 'vl/grep-configurable-threads' | Junio C Hamano | 2016-01-12 | 1 | -15/+31 |
|\ \ \ \ \ | |||||
| * | | | | | grep: add --threads=<num> option and grep.threads configurationvl/grep-configurable-threads | Victor Leschuk | 2015-12-16 | 1 | -13/+30 |
| * | | | | | grep: slight refactoring to the code that disables threading | Victor Leschuk | 2015-12-15 | 1 | -2/+1 |
| * | | | | | grep: allow threading even on a single-core machine | Victor Leschuk | 2015-12-15 | 1 | -1/+1 |
* | | | | | | Merge branch 'ea/blame-progress' | Junio C Hamano | 2016-01-12 | 1 | -4/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: add support for --[no-]progress optionea/blame-progress | Edmundo Carmona Antoranz | 2015-12-16 | 1 | -4/+30 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'rs/show-branch-argv-array' into maint | Junio C Hamano | 2015-12-11 | 1 | -16/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/pop-commit' into maint | Junio C Hamano | 2015-12-11 | 5 | -37/+14 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dk/gc-idx-wo-pack' into maint | Junio C Hamano | 2015-12-04 | 2 | -2/+45 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'sb/submodule-parallel-fetch' | Junio C Hamano | 2016-01-12 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodules: allow parallel fetching, add tests and documentation | Stefan Beller | 2015-12-16 | 2 | -1/+11 |
* | | | | | | | | | | Merge branch 'ps/push-delete-option' | Junio C Hamano | 2016-01-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | push: add '-d' as shorthand for '--delete'ps/push-delete-option | Patrick Steinhardt | 2015-12-16 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/symbolic-ref-maint' | Junio C Hamano | 2015-12-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | symbolic-ref: propagate error code from create_symref() | Jeff King | 2015-12-21 | 1 | -1/+1 |
* | | | | | | | | | push: don't mark options of recurse-submodules for translation | Ralf Thielow | 2015-12-22 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'bc/format-patch-null-from-line' | Junio C Hamano | 2015-12-21 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | format-patch: add an option to suppress commit hash | brian m. carlson | 2015-12-15 | 1 | -0/+5 |
* | | | | | | | | | | Merge branch 'mc/push-recurse-submodules-config' | Junio C Hamano | 2015-12-21 | 1 | -16/+19 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | push: follow the "last one wins" convention for --recurse-submodulesmc/push-recurse-submodules-config | Mike Crowe | 2015-12-04 | 1 | -9/+3 |
| * | | | | | | | | | push: add recurseSubmodules config option | Mike Crowe | 2015-11-20 | 1 | -15/+24 |
* | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-12-10 | 37 | -279/+281 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 27 | -107/+107 |
| * | | | | | | | | | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 25 | -125/+125 |
| * | | | | | | | | | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 26 | -109/+109 |
| * | | | | | | | | | ref_newer: convert to use struct object_id | brian m. carlson | 2015-11-20 | 1 | -1/+1 |
| * | | | | | | | | | add_sought_entry_mem: convert to struct object_id | brian m. carlson | 2015-11-20 | 1 | -6/+8 |
| * | | | | | | | | | Convert struct ref to use object_id. | brian m. carlson | 2015-11-20 | 6 | -43/+43 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dt/refs-backend-pre-vtable' | Junio C Hamano | 2015-12-08 | 1 | -12/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | initdb: make safe_create_dir public | David Turner | 2015-11-20 | 1 | -12/+0 |
* | | | | | | | | | | Merge branch 'rs/parseopt-short-help' | Junio C Hamano | 2015-12-04 | 2 | -27/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-help | René Scharfe | 2015-11-20 | 1 | -11/+1 |
| * | | | | | | | | | | grep: stop using PARSE_OPT_NO_INTERNAL_HELP | René Scharfe | 2015-11-20 | 1 | -16/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-01 | 1 | -16/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | blame: fix object casting regression | Jeff King | 2015-11-24 | 1 | -16/+14 |
* | | | | | | | | | | | Merge branch 'maint' | Jeff King | 2015-12-01 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipe | Clemens Buchacher | 2015-11-16 | 1 | -0/+3 |
| * | | | | | | | | | Merge branch 'js/misc-fixes' into maint | Junio C Hamano | 2015-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ |