global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-03 13:30:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
63,663 Commits 6 Branches 1,001 Tags
ea00f105a7f86ff669195d1225c034dad9cc0708
Commit Graph

13588 Commits

Author SHA1 Message Date
Junio C Hamano
5d8b3e5d8b Merge branch 'uk/merge-subtree-doc-update' 
Belated documentation update to adjust to a new world order that
happened a yew years ago.

* uk/merge-subtree-doc-update:
  howto/using-merge-subtree: mention --allow-unrelated-histories
 2018-10-30 15:43:49 +09:00
Junio C Hamano
87c15d1ca9 Merge branch 'dl/mergetool-gui-option' 
"git mergetool" learned to take the "--[no-]gui" option, just like
"git difftool" does.

* dl/mergetool-gui-option:
  doc: document diff/merge.guitool config keys
  completion: support `git mergetool --[no-]gui`
  mergetool: accept -g/--[no-]gui as arguments
 2018-10-30 15:43:49 +09:00
Junio C Hamano
90d228b0d7 Merge branch 'ah/doc-updates' 
Doc updates.

* ah/doc-updates:
  doc: fix formatting in git-update-ref
  doc: fix indentation of listing blocks in gitweb.conf.txt
  doc: fix descripion for 'git tag --format'
  doc: fix inappropriate monospace formatting
  doc: fix ASCII art tab spacing
  doc: clarify boundaries of 'git worktree list --porcelain'
 2018-10-30 15:43:47 +09:00
Junio C Hamano
4b73fdae97 Merge branch 'sg/doc-show-branch-typofix' 
Docfix.

* sg/doc-show-branch-typofix:
  doc: fix small typo in git show-branch
 2018-10-30 15:43:44 +09:00
Junio C Hamano
107b9bad95 Merge branch 'tb/filter-alternate-refs' 
Test fix.

* tb/filter-alternate-refs:
  t5410: use longer path for sample script
  Documentation/config.txt: fix typo in core.alternateRefsCommand
 2018-10-30 15:43:41 +09:00
Junio C Hamano
8a0d060fb1 Merge branch 'rv/send-email-cc-misc-by' 
"git send-email" learned to grab address-looking string on any
trailer whose name ends with "-by"; --suppress-cc=misc-by on the
command line, or setting sendemail.suppresscc configuration
variable to "misc-by", can be used to disable this behaviour.

This is a backward-incompatible change that may surprise existing
users.

* rv/send-email-cc-misc-by:
  send-email: also pick up cc addresses from -by trailers
  send-email: only consider lines containing @ or <> for automatic Cc'ing
  Documentation/git-send-email.txt: style fixes
 2018-10-30 15:43:40 +09:00
Junio C Hamano
77d503757d Merge branch 'md/filter-trees' 
The "rev-list --filter" feature learned to exclude all trees via
"tree:0" filter.

* md/filter-trees:
  list-objects: support for skipping tree traversal
  filter-trees: code clean-up of tests
  list-objects-filter: implement filter tree:0
  list-objects-filter-options: do not over-strbuf_init
  list-objects-filter: use BUG rather than die
  revision: mark non-user-given objects instead
  rev-list: handle missing tree objects properly
  list-objects: always parse trees gently
  list-objects: refactor to process_tree_contents
  list-objects: store common func args in struct
 2018-10-30 15:43:39 +09:00
Nguyễn Thái Ngọc Duy
e5bbe09e88 wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode 
In WM_PATHNAME mode (or FNM_PATHNAME), '*' does not match '/' and '**'
can but only in three patterns:

- '**/' matches zero or more leading directories
- '/**/' matches zero or more directories in between
- '/**' matches zero or more trailing directories/files

When '**' is present but not in one of these patterns, the current
behavior is consider the pattern invalid and stop matching. In other
words, 'foo**bar' never matches anything, whatever you throw at it.

This behavior is arguably a bit confusing partly because we can't
really tell the user their pattern is invalid so that they can fix
it. So instead, tolerate it and make '**' act like two regular '*'s
(which is essentially the same as a single asterisk). This behavior
seems more predictable.

Noticed-by: dana <dana@dana.is>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 13:19:22 +09:00
Nguyễn Thái Ngọc Duy
649cf58911 config.txt: move worktree.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:05 +09:00
Nguyễn Thái Ngọc Duy
6053f1ae13 config.txt: remove config/dummy.txt 
This file was only needed when config directory was empty. Now that
the directory is fully populated, it can be deleted.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:05 +09:00
Nguyễn Thái Ngọc Duy
07c11a0bd0 config.txt: move web.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:05 +09:00
Nguyễn Thái Ngọc Duy
25268ad5b1 config.txt: move versionsort.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:05 +09:00
Nguyễn Thái Ngọc Duy
18b421d4f6 config.txt: move user.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:05 +09:00
Nguyễn Thái Ngọc Duy
e4a7a7b073 config.txt: move url.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
533fff6ad1 config.txt: move uploadpack.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
c61f5562e6 config.txt: move uploadarchive.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
4a5bad0704 config.txt: move transfer.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
fb4c06fa4c config.txt: move tag.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
95c125f2bc config.txt: move submodule.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
46a8bbb27f config.txt: move stash.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
54ff5dda44 config.txt: move status.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
2ef0e469fe config.txt: move splitIndex.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
c52bcbb6c0 config.txt: move showBranch.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
c332419995 config.txt: move sequencer.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
0ee42c86cf config.txt: move sendemail-config.txt to config/ 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
e344b8b4c3 config.txt: move reset.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
72622c2486 config.txt: move rerere.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
be958be236 config.txt: move repack.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:04 +09:00
Nguyễn Thái Ngọc Duy
b720a9dbe5 config.txt: move remotes.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
99fce39734 config.txt: move remote.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
5f5a5fca54 config.txt: move receive-config.txt to config/ 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
c72459006d config.txt: move rebase-config.txt to config/ 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
d15dc43968 config.txt: move push-config.txt to config/ 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
7f50a495f6 config.txt: move pull-config.txt to config/ 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
dd55172c32 config.txt: move protocol.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
cd96754770 config.txt: move pretty.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
87e1b41a30 config.txt: move pager.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
a168c5a2cd config.txt: move pack.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
e50472d86d config.txt: move notes.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
ea24a76a5e config.txt: move mergetool.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
7fb5ab4a02 config.txt: move merge-config.txt to config/ 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
f7ade6c980 config.txt: move man.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
4a9f0c52cf config.txt: move mailmap.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00
Nguyễn Thái Ngọc Duy
55e51cd741 config.txt: move mailinfo.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00
Nguyễn Thái Ngọc Duy
8300976295 config.txt: move log.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00
Nguyễn Thái Ngọc Duy
630c273846 config.txt: move interactive.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00
Nguyễn Thái Ngọc Duy
cef9b95131 config.txt: move instaweb.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00
Nguyễn Thái Ngọc Duy
ec335607b7 config.txt: move init.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00
Nguyễn Thái Ngọc Duy
c1b342adce config.txt: move index.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00
Nguyễn Thái Ngọc Duy
ae461026a4 git-imap-send.txt: move imap.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:02 +09:00