summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* completion: add completion for --recurse-submodules=onlybw/push-submodule-onlyCornelius Weig2017-02-011-1/+1
* doc: add doc for git-push --recurse-submodules=onlyCornelius Weig2017-02-011-6/+7
* push: add option to push only submodulesBrandon Williams2016-12-204-4/+35
* submodules: add RECURSE_SUBMODULES_ONLY valueBrandon Williams2016-12-202-0/+3
* transport: reformat flag #defines to be more readableBrandon Williams2016-12-201-15/+15
* Second batch for 2.12Junio C Hamano2016-12-191-3/+90
* Merge branch 'kh/tutorial-grammofix'Junio C Hamano2016-12-191-6/+6
|\
| * doc: omit needless "for"kh/tutorial-grammofixKristoffer Haugsbakk2016-12-091-1/+1
| * doc: make the intent of sentence clearerKristoffer Haugsbakk2016-12-091-1/+1
| * doc: add verb in front of command to runKristoffer Haugsbakk2016-12-091-1/+1
| * doc: add articles (grammar)Kristoffer Haugsbakk2016-12-091-3/+3
* | Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano2016-12-191-5/+5
|\ \
| * | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkeyDavid Aguilar2016-12-111-5/+5
* | | Merge branch 'lr/doc-fix-cet'Junio C Hamano2016-12-191-1/+1
|\ \ \
| * | | date-formats.txt: Typo fixlr/doc-fix-cetLuis Ressel2016-12-121-1/+1
* | | | Merge branch 'sb/t3600-cleanup'Junio C Hamano2016-12-191-73/+51
|\ \ \ \
| * | | | t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * | | | t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | | | | Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-192-4/+35
|\ \ \ \ \
| * | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-292-4/+35
* | | | | | Merge branch 'ld/p4-worktree'Junio C Hamano2016-12-193-4/+65
|\ \ \ \ \ \
| * | | | | | git-p4: support git worktreesld/p4-worktreeLuke Diamand2016-12-133-4/+65
* | | | | | | Merge branch 'jk/make-tags-find-sources-tweak'Junio C Hamano2016-12-191-3/+16
|\ \ \ \ \ \ \
| * | | | | | | Makefile: exclude contrib from FIND_SOURCE_FILESjk/make-tags-find-sources-tweakJeff King2016-12-141-0/+2
| * | | | | | | Makefile: match shell scripts in FIND_SOURCE_FILESJeff King2016-12-141-1/+3
| * | | | | | | Makefile: exclude test cruft from FIND_SOURCE_FILESJeff King2016-12-141-1/+7
| * | | | | | | Makefile: reformat FIND_SOURCE_FILESJeff King2016-12-141-3/+6
* | | | | | | | Merge branch 'js/normalize-path-copy-ceil'Junio C Hamano2016-12-191-9/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | normalize_path_copy(): fix pushing to //server/share/dir on Windowsjs/normalize-path-copy-ceilJohannes Sixt2016-12-161-9/+14
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'bb/unicode-9.0'Junio C Hamano2016-12-196-65/+163
|\ \ \ \ \ \ \ \
| * | | | | | | | unicode_width.h: update the width tables to Unicode 9.0bb/unicode-9.0Beat Bolli2016-12-141-24/+107
| * | | | | | | | update_unicode.sh: remove the plane filterBeat Bolli2016-12-141-2/+1
| * | | | | | | | update_unicode.sh: automatically download newer definition filesBeat Bolli2016-12-141-6/+2
| * | | | | | | | update_unicode.sh: pin the uniset repo to a known good commitBeat Bolli2016-12-131-1/+2
| * | | | | | | | update_unicode.sh: remove an unnecessary subshell levelBeat Bolli2016-12-131-27/+26
| * | | | | | | | update_unicode.sh: move it into contrib/update-unicodeBeat Bolli2016-12-134-6/+26
* | | | | | | | | Merge branch 'jk/readme-gmane-is-no-more'Junio C Hamano2016-12-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | README: replace gmane link with public-inboxjk/readme-gmane-is-no-moreJeff King2016-12-151-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-1922-36/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lockfile: LOCK_REPORT_ON_ERRORJunio C Hamano2016-12-073-4/+18
| * | | | | | | | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-0718-29/+27
| * | | | | | | | | wt-status: implement opportunisitc index update correctlyJunio C Hamano2016-12-071-3/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/xdiff-drop-xdl-fast-hash'Junio C Hamano2016-12-193-118/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xdiff: drop XDL_FAST_HASHjk/xdiff-drop-xdl-fast-hashJeff King2016-12-063-118/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-194-4/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forgetNguyễn Thái Ngọc Duy2016-12-114-4/+37
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/trailers-placeholder-in-pretty'Junio C Hamano2016-12-196-1/+93
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter: add support to display trailers as part of contentsjk/trailers-placeholder-in-prettyJacob Keller2016-12-113-1/+49
| * | | | | | | | | pretty: add %(trailers) format for displaying trailers of a commit messageJacob Keller2016-12-113-0/+45
* | | | | | | | | | Merge branch 'ak/commit-only-allow-empty'Junio C Hamano2016-12-193-4/+12
|\ \ \ \ \ \ \ \ \ \