summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/exclusion-regression-fix'Junio C Hamano2016-01-203-118/+6
|\
| * Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"Nguyễn Thái Ngọc Duy2016-01-083-117/+5
* | Merge branch 'dk/reflog-walk-with-non-commit'Junio C Hamano2016-01-202-5/+24
|\ \
| * | reflog-walk: don't segfault on non-commit sha1's in the reflogdk/reflog-walk-with-non-commitDennis Kaarsemaker2016-01-052-5/+24
* | | Merge branch 'sg/t6050-failing-editor-test-fix'Junio C Hamano2016-01-201-3/+7
|\ \ \
| * | | t6050-replace: make failing editor test more robustsg/t6050-failing-editor-test-fixSZEDER Gábor2016-01-051-3/+7
* | | | Merge branch 'ew/for-each-ref-doc'Junio C Hamano2016-01-201-2/+7
|\ \ \ \
| * | | | for-each-ref: document `creatordate` and `creator` fieldsew/for-each-ref-docEric Wong2016-01-051-2/+7
* | | | | Merge branch 'dw/signoff-doc'Junio C Hamano2016-01-205-1/+9
|\ \ \ \ \
| * | | | | Expand documentation describing --signoffdw/signoff-docDavid A. Wheeler2016-01-055-1/+9
* | | | | | Merge branch 'jk/clang-pedantic'Junio C Hamano2016-01-204-5/+6
|\ \ \ \ \ \
| * | | | | | bswap: add NO_UNALIGNED_LOADS definejk/clang-pedanticJeff King2016-01-041-2/+3
| * | | | | | avoid shifting signed integers 31 bitsJeff King2016-01-043-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ew/send-email-mutt-alias-fix'Junio C Hamano2016-01-202-2/+22
|\ \ \ \ \ \
| * | | | | | git-send-email: do not double-escape quotes from muttew/send-email-mutt-alias-fixEric Wong2016-01-042-2/+22
* | | | | | | Merge branch 'ss/user-manual'Junio C Hamano2016-01-202-10/+36
|\ \ \ \ \ \ \
| * | | | | | | user-manual: add addition gitweb informationss/user-manualStephen P. Smith2015-12-301-4/+11
| * | | | | | | user-manual: add section documenting shallow clonesStephen P. Smith2015-12-301-3/+20
| * | | | | | | glossary: define the term shallow cloneStephen P. Smith2015-12-291-0/+5
| * | | | | | | user-manual: remove temporary branch entry from todo listStephen P. Smith2015-12-281-3/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nd/clear-gitenv-upon-use-of-alias'Junio C Hamano2016-01-205-20/+65
|\ \ \ \ \ \ \
| * | | | | | | run-command: don't warn on SIGPIPE deathsJeff King2015-12-291-1/+1
| * | | | | | | git.c: make sure we do not leak GIT_* to alias scriptsNguyễn Thái Ngọc Duy2015-12-222-3/+24
| * | | | | | | setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..Nguyễn Thái Ngọc Duy2015-12-223-12/+36
| * | | | | | | git.c: make it clear save_env() is for alias handling onlyNguyễn Thái Ngọc Duy2015-12-221-6/+6
| * | | | | | | Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-aliasJunio C Hamano2015-12-222-3/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup'Junio C Hamano2016-01-206-10/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-064-4/+5
| * | | | | | | | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-251-5/+0
* | | | | | | | | | Merge branch 'nd/dir-exclude-cleanup'Junio C Hamano2016-01-201-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | dir.c: clean the entire struct in clear_exclude_list()nd/dir-exclude-cleanupNguyễn Thái Ngọc Duy2015-12-281-3/+1
* | | | | | | | | | | Merge branch 'jk/pack-revindex'Junio C Hamano2016-01-204-90/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-revindex: store entries directly in packed_gitjk/pack-revindexJeff King2015-12-214-41/+32
| * | | | | | | | | | | pack-revindex: drop hash tableJeff King2015-12-212-54/+8
* | | | | | | | | | | | Merge branch 'mh/notes-allow-reading-treeish'Junio C Hamano2016-01-207-30/+55
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | notes: allow treeish expressions as notes refmh/notes-allow-reading-treeishMike Hommey2016-01-127-30/+55
* | | | | | | | | | | | | Sync with maintJunio C Hamano2016-01-122-0/+11863
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-01-122-0/+11863
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | l10n: ko.po: Add Korean translationChangwoo Ryu2016-01-032-0/+11863
* | | | | | | | | | | | | | First batch for post 2.7 cycleJunio C Hamano2016-01-123-2/+46
* | | | | | | | | | | | | | Merge branch 'vl/grep-configurable-threads'Junio C Hamano2016-01-124-15/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: add --threads=<num> option and grep.threads configurationvl/grep-configurable-threadsVictor Leschuk2015-12-164-13/+44
| * | | | | | | | | | | | | | 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-123-5/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame: add support for --[no-]progress optionea/blame-progressEdmundo Carmona Antoranz2015-12-163-5/+39
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano2016-01-1215-74/+731
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | submodules: allow parallel fetching, add tests and documentationStefan Beller2015-12-166-4/+40
| * | | | | | | | | | | | | | | | fetch_populated_submodules: use new parallel job processingStefan Beller2015-12-161-44/+98