delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	completion: add remaining flags to checkouttb/complete-checkout	Thomas Braun	2017-10-25	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the commits 1fc458d9 (builtin/checkout: add --recurse-submodules switch, 2017-03-14), 08d595dc (checkout: add --ignore-skip-worktree-bits in sparse checkout mode, 2013-04-13) and 32669671 (checkout: introduce --detach synonym for "git checkout foo^{commit}", 2011-02-08) checkout gained new flags but the completion was not updated, although these flags are useful completions. Add them. The flags --force and --ignore-other-worktrees are not added as they are potentially dangerous. The flags --progress and --no-progress are only useful for scripting and are therefore also not included. Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po	Junio C Hamano	2017-10-24	12	-24768/+42782
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	l10n for Git 2.15.0 round 2 * tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: review for git v2.15.0 l10n round 2 l10n: zh_CN: for git v2.15.0 l10n round 2 l10n: de.po: fix typos l10n: de.po: translate 70 new messages l10n: ru.po: update Russian translation l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 l10n: sv.po: Update Swedish translation (3245t0f0u) l10n: fr.po: v2.15.0 round 2 l10n: fr.po change translation of "First, rewinding" l10n: fr.po fix some mistakes l10n: Update Catalan translation l10n: ko.po: Update Korean translation l10n: es.po: v2.15.0 round 2 l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed) l10n: ru.po: update Russian translation l10n: bg.po: Updated Bulgarian translation (3245t) l10n: sv.po: Update Swedish translation (3245t0f0u) l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 l10n: es.po: Update translation v2.15.0 round 1 l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed) ...
\| *	Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git	Jiang Xin	2017-10-24	1	-2414/+2557
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'jx/zh_CN-proposed' of github.com:jiangxin/git: l10n: zh_CN: review for git v2.15.0 l10n round 2 l10n: zh_CN: for git v2.15.0 l10n round 2
\| \| *	l10n: zh_CN: review for git v2.15.0 l10n round 2	Ray Chen	2017-10-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ray Chen <oldsharp@gmail.com>
\| \| *	l10n: zh_CN: for git v2.15.0 l10n round 2	Jiang Xin	2017-10-24	1	-2414/+2557
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Translate 69 messages (3245t0f0u) for git v2.15.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: 依云 <lilydjwg@gmail.com>
\| *	Merge branch 'master' of https://github.com/ralfth/git-po-de	Jiang Xin	2017-10-24	1	-2448/+2630
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: fix typos l10n: de.po: translate 70 new messages
\| \| *	l10n: de.po: fix typos	Andre Hinrichs	2017-10-23	1	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Andre Hinrichs <andre.hinrichs@gmx.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| \| *	l10n: de.po: translate 70 new messages	Ralf Thielow	2017-10-23	1	-2435/+2617
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 70 new messages came from git.pot update in 25eab542b (l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)) and 9c07fab78 (l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| *	l10n: ru.po: update Russian translation	Dimitriy Ryazantcev	2017-10-22	1	-50/+50
\| \| \| \| \| \| \| \|	Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
\| *	Merge branch 'master' of https://github.com/vnwildman/git	Jiang Xin	2017-10-22	1	-51/+55
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/vnwildman/git: l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2
\| \| *	l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2	Tran Ngoc Quan	2017-10-19	1	-51/+55
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| * \|	Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git	Jiang Xin	2017-10-19	1	-2427/+2612
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git: l10n: fr.po: v2.15.0 round 2 l10n: fr.po change translation of "First, rewinding" l10n: fr.po fix some mistakes
\| \| * \|	l10n: fr.po: v2.15.0 round 2	Jean-Noel Avila	2017-10-18	1	-2424/+2612
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| \| * \|	l10n: fr.po change translation of "First, rewinding"	Nicolas Cornu	2017-10-18	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nicolas Cornu <nicolac76@yahoo.fr>
\| \| * \|	l10n: fr.po fix some mistakes	Jean-Noel Avila	2017-10-18	1	-7/+5
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Reported-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr> Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
\| * \|	Merge branch 'master' of git://github.com/nafmo/git-l10n-sv	Jiang Xin	2017-10-19	1	-55/+58
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3245t0f0u)
\| \| * \|	l10n: sv.po: Update Swedish translation (3245t0f0u)	Peter Krefting	2017-10-18	1	-55/+58
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| * \|	Merge branch 'master' of https://github.com/Softcatala/git-po	Jiang Xin	2017-10-19	1	-3008/+2991
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation
\| \| * \|	l10n: Update Catalan translation	Jordi Mas	2017-10-17	1	-3008/+2991
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Jordi Mas <jmas@softcatala.org>
\| * \|	Merge branch 'translation' of https://github.com/ChrisADR/git-po	Jiang Xin	2017-10-19	1	-50/+54
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'translation' of https://github.com/ChrisADR/git-po: l10n: es.po: v2.15.0 round 2
\| \| * \|	l10n: es.po: v2.15.0 round 2	Christopher Díaz Riveros	2017-10-16	1	-50/+54
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spanish translation for v2.15.0 Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
\| * \|	l10n: ko.po: Update Korean translation	Changwoo Ryu	2017-10-17	1	-2411/+2535
\| \|/ \| \| \| \| \| \|	Signed-off-by: Changwoo Ryu <cwryu@debian.org>
\| *	l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)	Jiang Xin	2017-10-17	1	-47/+48
\| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.15.0-rc1 for git v2.15.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| *	Merge branch 'master' of git://github.com/git-l10n/git-po	Jiang Xin	2017-10-17	7	-12060/+29445
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/git-l10n/git-po: l10n: ru.po: update Russian translation l10n: bg.po: Updated Bulgarian translation (3245t) l10n: sv.po: Update Swedish translation (3245t0f0u) l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 l10n: es.po: Update translation v2.15.0 round 1 l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed) l10n: es.po: spanish added to TEAMS l10n: es.po: initial Spanish version git 2.14.0
\| \| *	l10n: ru.po: update Russian translation	Dimitriy Ryazantcev	2017-10-15	1	-2381/+2521
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
\| \| *	Merge branch 'master' of git://github.com/alshopov/git-po	Jiang Xin	2017-10-14	1	-2419/+2554
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3245t)
\| \| \| *	l10n: bg.po: Updated Bulgarian translation (3245t)	Alexander Shopov	2017-10-14	1	-2419/+2554
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alexander Shopov <ash@kambanaria.org>
\| \| * \|	l10n: sv.po: Update Swedish translation (3245t0f0u)	Peter Krefting	2017-10-11	1	-2475/+2674
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| \| *	Merge branch 'master' of https://github.com/vnwildman/git	Jiang Xin	2017-10-11	1	-2425/+2598
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/vnwildman/git: l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0
\| \| \| *	l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0	Tran Ngoc Quan	2017-10-09	1	-2425/+2598
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| \| * \|	l10n: es.po: Update translation v2.15.0 round 1	Christopher Díaz	2017-10-08	1	-2732/+3574
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
\| \| *	Merge branch 'maint' of git://github.com/git-l10n/git-po	Jiang Xin	2017-10-08	2	-0/+15757
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'maint' of git://github.com/git-l10n/git-po: l10n: es.po: spanish added to TEAMS l10n: es.po: initial Spanish version git 2.14.0
\| \| \| *	l10n: es.po: spanish added to TEAMS	Christopher Díaz	2017-08-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
\| \| \| *	l10n: es.po: initial Spanish version git 2.14.0	Christopher Díaz	2017-08-27	1	-0/+15753
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
\| \| * \|	l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)	Jiang Xin	2017-10-08	1	-2360/+2499
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from commit d35688db19 ("Prepare for -rc1", 2017-10-07) for git v2.15.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* \| \| \|	Sync with 2.14.3	Junio C Hamano	2017-10-23	1	-0/+24
\|\ \ \ \
\| * \| \| \|	Git 2.14.3v2.14.3 maint-2.14	Junio C Hamano	2017-10-23	2	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| * \| \| \|	Merge branch 'jk/info-alternates-fix' into maint	Junio C Hamano	2017-10-23	1	-20/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A regression fix for 2.11 that made the code to read the list of alternate object stores overrun the end of the string. * jk/info-alternates-fix: read_info_alternates: warn on non-trivial errors read_info_alternates: read contents into strbuf
\| * \ \ \ \	Merge branch 'jc/fetch-refspec-doc-update' into maint	Junio C Hamano	2017-10-23	1	-2/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"git fetch <there> <src>:<dst>" allows an object name on the <src> side when the other side accepts such a request since Git v2.5, but the documentation was left stale. * jc/fetch-refspec-doc-update: fetch doc: src side of refspec could be full SHA-1
\| * \ \ \ \ \	Merge branch 'jk/write-in-full-fix' into maint	Junio C Hamano	2017-10-23	22	-67/+65
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many codepaths did not diagnose write failures correctly when disks go full, due to their misuse of write_in_full() helper function, which have been corrected. * jk/write-in-full-fix: read_pack_header: handle signed/unsigned comparison in read result config: flip return value of store_write_*() notes-merge: use ssize_t for write_in_full() return value pkt-line: check write_in_full() errors against "< 0" convert less-trivial versions of "write_in_full() != len" avoid "write_in_full(fd, buf, len) != len" pattern get-tar-commit-id: check write_in_full() return against 0 config: avoid "write_in_full(fd, buf, len) < len" pattern
\| * \ \ \ \ \ \	Merge branch 'rj/no-sign-compare' into maint	Junio C Hamano	2017-10-23	10	-24/+25
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings
\| * \ \ \ \ \ \ \	Merge branch 'ma/ts-cleanups' into maint	Junio C Hamano	2017-10-23	6	-3/+37
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Assorted bugfixes and clean-ups. * ma/ts-cleanups: ThreadSanitizer: add suppressions strbuf_setlen: don't write to strbuf_slopbuf pack-objects: take lock before accessing `remaining` convert: always initialize attr_action in convert_attrs
\| * \ \ \ \ \ \ \ \	Merge branch 'ls/travis-scriptify' into maint	Junio C Hamano	2017-10-23	10	-81/+154
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The scripts to drive TravisCI has been reorganized and then an optimization to avoid spending cycles on a branch whose tip is tagged has been implemented. * ls/travis-scriptify: travis-ci: fix "skip_branch_tip_with_tag()" string comparison travis: dedent a few scripts that are indented overly deeply travis-ci: skip a branch build if equal tag is present travis-ci: move Travis CI code into dedicated scripts
\| * \ \ \ \ \ \ \ \ \	Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maint	Junio C Hamano	2017-10-23	2	-3/+145
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The checkpoint command "git fast-import" did not flush updates to refs and marks unless at least one object was created since the last checkpoint, which has been corrected, as these things can happen without any new object getting created. * er/fast-import-dump-refs-on-checkpoint: fast-import: checkpoint: dump branches/tags/marks even if object_count==0
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'jt/fast-export-copy-modify-fix' into maint	Junio C Hamano	2017-10-23	2	-15/+51
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"git fast-export" with -M/-C option issued "copy" instruction on a path that is simultaneously modified, which was incorrect. * jt/fast-export-copy-modify-fix: fast-export: do not copy from modified file
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'nd/worktree-kill-parse-ref' into maint	Junio C Hamano	2017-10-23	3	-3/+17
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"git branch -M a b" while on a branch that is completely unrelated to either branch a or branch b misbehaved when multiple worktree was in use. This has been fixed. * nd/worktree-kill-parse-ref: branch: fix branch renaming not updating HEADs correctly
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Git 2.15-rc2v2.15.0-rc2	Junio C Hamano	2017-10-19	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/branch-force-doc-readability-fix'	Junio C Hamano	2017-10-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * jc/branch-force-doc-readability-fix: branch doc: sprinkle a few commas for readability
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	branch doc: sprinkle a few commas for readabilityjc/branch-force-doc-readability-fix	Junio C Hamano	2017-10-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "--force" option can also be used when the named branch does not yet exist, and the point of the option is the user can (re)point the branch to the named commit even if it does. Add 'even' before 'if' to clarify. Also, insert another comma after "Without -f" before "the command refuses..." to make the text easier to parse. Incidentally, this change should help certain versions of docbook-xsl-stylesheets that render the original without any whitespace between "-f" and "git". Noticed-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Jeff King <peff@peff.net> Helped-by: Andreas Schwab <schwab@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dg/filter-branch-filter-order-doc'	Junio C Hamano	2017-10-19	2	-16/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the documentation for "git filter-branch" so that the filter options are listed in the same order as they are applied, as described in an earlier part of the doc. * dg/filter-branch-filter-order-doc: doc: list filter-branch subdirectory-filter first