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

	Commit message (Collapse)	Author	Age	Files	Lines
*	rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanup	Jeff King	2017-03-15	1	-29/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All of these options do the same thing "--foo" iterates over the "foo" refs, and "--foo=<glob>" does the same with a glob. We can factor this into its own function to avoid repeating ourselves. There are two subtleties to note: - the original called for_each_branch_ref(), etc, in the non-glob case. Now we will call for_each_ref_in("refs/heads/") which is exactly what for_each_branch_ref() did under the hood. - for --glob, we'll call for_each_glob_ref_in() with a NULL "prefix" argument. Which is exactly what for_each_glob_ref() was doing already. So both cases should behave identically, and it seems reasonable to assume that this will remain the same. The functions we are calling now are the more-generic ones, and the ones we are dropping are just convenience wrappers. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	rev-parse: add helper for parsing "--foo/--foo="	Jeff King	2017-03-15	1	-10/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can't just use a bare skip_prefix() for these cases, because we need to match both the "--foo" form and the "--foo=<value>" form (and tell the difference between the two in the caller). We can wrap this in a simple helper which has two obvious callsites, and will gain some more in the next patch. Note that the error output for abbrev-ref changes slightly, as we don't keep our original "arg" pointer. However, the new output should hopefully be more clear: [before] fatal: unknown mode for --abbrev-ref=foo [after] fatal: unknown mode for --abbrev-ref: foo Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	rev-parse: use skip_prefix when parsing options	Jeff King	2017-03-15	1	-20/+20
\| \| \| \| \| \| \| \| \|	Using skip_prefix lets us avoid manually-counted offsets into the argument string. This patch converts the simple and obvious cases. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Git 2.12v2.12.0	Junio C Hamano	2017-02-24	3	-1/+12
\| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Merge branch 'ps/doc-gc-aggressive-depth-update'	Junio C Hamano	2017-02-24	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * ps/doc-gc-aggressive-depth-update: docs/git-gc: fix default value for `--aggressiveDepth`
\| *	docs/git-gc: fix default value for `--aggressiveDepth`ps/doc-gc-aggressive-depth-update	Patrick Steinhardt	2017-02-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In commit 07e7dbf0d (gc: default aggressive depth to 50, 2016-08-11), the default aggressive depth of git-gc has been changed to 50. While git-config(1) has been updated to represent the new default value, git-gc(1) still mentions the old value. This patch fixes it. Signed-off-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \|	Merge branch 'bc/worktree-doc-fix-detached'	Junio C Hamano	2017-02-24	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * bc/worktree-doc-fix-detached: Documentation: correctly spell git worktree --detach
\| * \|	Documentation: correctly spell git worktree --detachbc/worktree-doc-fix-detached	brian m. carlson	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The option is “--detach”, but we accidentally spelled it “--detached” at one point in the man page. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Reported-by: Casey Rodarmor <casey@rodarmor.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \|	Merge branch 'dr/doc-check-ref-format-normalize'	Junio C Hamano	2017-02-24	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * dr/doc-check-ref-format-normalize: git-check-ref-format: clarify documentation for --normalize
\| * \| \|	git-check-ref-format: clarify documentation for --normalizedr/doc-check-ref-format-normalize	Damien Regad	2017-02-21	1	-3/+3
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use of 'iff' may be confusing to people not familiar with this term. Improving the --normalize option's documentation to remove the use of 'iff', and clearly describe what happens when the condition is not met. Signed-off-by: Damien Regad <dregad@mantisbt.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \|	Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'	Junio C Hamano	2017-02-24	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * gp/document-dotfiles-in-templates-are-not-copied: init: document dotfiles exclusion on template copy
\| * \| \|	init: document dotfiles exclusion on template copygp/document-dotfiles-in-templates-are-not-copied	Grégoire Paris	2017-02-17	1	-2/+2
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not just . and .., but any path that begins with dot is not copied when copying the template directory to a new repository. You can customize the template directory, copying some dotfiles might make sense, but it's actually a good thing not to, because you would not want to have your git directory copied in every git directory that is created should you decide to put your template directory under version control, for example. Plus, it might be used as a feature by people who would want to exclude some files. Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \|	Merge branch 'rt/align-add-i-help-text'	Junio C Hamano	2017-02-24	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * rt/align-add-i-help-text: git add -i: replace \t with blanks in the help message
\| * \| \|	git add -i: replace \t with blanks in the help messagert/align-add-i-help-text	Ralf Thielow	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Within the help message of 'git add -i', the 'diff' command uses one tab character and blanks to create the space between the name and the description while the others use blanks only. So if the tab size is not at 4 characters, this description will not be in range. Replace the tab character with blanks. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \|	Merge branch 'bc/blame-doc-fix'	Junio C Hamano	2017-02-24	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc update. * bc/blame-doc-fix: Documentation: use brackets for optional arguments
\| * \| \| \|	Documentation: use brackets for optional argumentsbc/blame-doc-fix	brian m. carlson	2017-02-22	1	-2/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The documentation for git blame used vertical bars for optional arguments to -M and -C, which is unusual and potentially confusing. Since most man pages use brackets for optional items, and that's consistent with how we document the same options for git diff and friends, use brackets here, too. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \|	Merge tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po	Junio C Hamano	2017-02-24	11	-16381/+30174
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	l10n-2.12.0-rnd2 * tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: for git v2.12.0 l10n round 2 l10n: Update Catalan translation l10n: pt_PT: update Portuguese tranlation l10n: sv.po: Update Swedish translation (3139t0f0u) l10n: de.po: translate 241 messages l10n: ko.po: Update Korean translation l10n: vi.po (3139t): Updated 2 new messages for rc1 l10n: fr.po: v2.12.0 round 2 3139t l10n: git.pot: v2.12.0 round 2 (2 new) l10n: vi.po: Updated Vietnamese translation (3137t) l10n: update Catalan translation l10n: sv.po: Update Swedish translation (3137t0f0u) l10n: fr.po: v2.11-rc0 first round l10n: ko.po: Update Korean translation l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed) l10n: bg: Updated Bulgarian translation (2913t+0f+0u) l10n: fixes to Catalan translation ...
\| * \| \| \|	l10n: zh_CN: for git v2.12.0 l10n round 2	Jiang Xin	2017-02-25	1	-1446/+2761
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 241 messages (3139t0f0u) for git v2.12.0-rc1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| * \| \| \|	l10n: Update Catalan translation	Jordi Mas	2017-02-25	1	-280/+340
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jordi Mas <jmas@softcatala.org>
\| * \| \| \|	l10n: pt_PT: update Portuguese tranlation	Vasco Almeida	2017-02-23	1	-1634/+2928
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
\| * \| \| \|	Merge branch 'master' of git://github.com/nafmo/git-l10n-sv	Jiang Xin	2017-02-22	1	-168/+176
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3139t0f0u)
\| \| * \| \| \|	l10n: sv.po: Update Swedish translation (3139t0f0u)	Peter Krefting	2017-02-20	1	-168/+176
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| * \| \| \| \|	l10n: de.po: translate 241 messages	Ralf Thielow	2017-02-20	1	-1472/+2859
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 241 messages came from git.pot update in 673bfad09 (l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)) and a4d94835a (l10n: git.pot: v2.12.0 round 2 (2 new)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
\| * \| \| \|	Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko	Jiang Xin	2017-02-19	1	-178/+200
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
\| \| * \| \| \|	l10n: ko.po: Update Korean translation	Changwoo Ryu	2017-02-19	1	-178/+200
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Changwoo Ryu <cwryu@debian.org>
\| * \| \| \| \|	Merge branch 'master' of https://github.com/vnwildman/git	Jiang Xin	2017-02-19	1	-169/+177
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/vnwildman/git: l10n: vi.po (3139t): Updated 2 new messages for rc1
\| \| * \| \| \| \|	l10n: vi.po (3139t): Updated 2 new messages for rc1	Tran Ngoc Quan	2017-02-18	1	-169/+177
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| * \| \| \| \|	l10n: fr.po: v2.12.0 round 2 3139t	Jean-Noel Avila	2017-02-18	1	-192/+234
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| * \| \| \|	l10n: git.pot: v2.12.0 round 2 (2 new)	Jiang Xin	2017-02-18	1	-167/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.12.0-rc1 for git v2.12.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-02-18	9	-11031/+20680
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/git-l10n/git-po: l10n: vi.po: Updated Vietnamese translation (3137t) l10n: update Catalan translation l10n: sv.po: Update Swedish translation (3137t0f0u) l10n: fr.po: v2.11-rc0 first round l10n: ko.po: Update Korean translation l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed) l10n: bg: Updated Bulgarian translation (2913t+0f+0u) l10n: fixes to Catalan translation l10n: zh_CN: review for git v2.11.0 l10n l10n: New Catalan translation maintainer
\| \| * \ \ \	Merge branch 'master' of https://github.com/vnwildman/git	Jiang Xin	2017-02-18	1	-1338/+2669
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/vnwildman/git: l10n: vi.po: Updated Vietnamese translation (3137t)
\| \| \| * \| \| \|	l10n: vi.po: Updated Vietnamese translation (3137t)	Tran Ngoc Quan	2017-02-17	1	-1338/+2669
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| \| * \| \| \| \|	Merge branch 'master' of https://github.com/Softcatala/git-po	Jiang Xin	2017-02-18	1	-1366/+2621
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/Softcatala/git-po: l10n: update Catalan translation
\| \| \| * \| \| \|	l10n: update Catalan translation	Jordi Mas	2017-02-16	1	-1366/+2621
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jordi Mas <jmas@softcatala.org>
\| \| * \| \| \| \|	Merge branch 'master' of git://github.com/nafmo/git-l10n-sv	Jiang Xin	2017-02-14	1	-1337/+2670
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3137t0f0u)
\| \| \| * \| \| \| \|	l10n: sv.po: Update Swedish translation (3137t0f0u)	Peter Krefting	2017-02-11	1	-1337/+2670
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| \| * \| \| \| \| \|	Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git	Jiang Xin	2017-02-14	1	-1344/+2655
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git: l10n: fr.po: v2.11-rc0 first round l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos
\| \| \| * \| \| \| \|	l10n: fr.po: v2.11-rc0 first round	Jean-Noel Avila	2017-02-11	1	-1337/+2648
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| \| \| * \| \| \| \|	l10n: fr.po: Fix a typo in the French translation	Anthony Ramine	2017-02-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Anthony Ramine <n.oxyde@gmail.com>
\| \| \| * \| \| \| \|	l10n: fr.po: Remove gender specific adjectives	Joachim Jablon	2017-02-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joachim Jablon <ewjoachim@gmail.com> Reviewed-by: Jean-Noel Avila <jn.avila@free.fr>
\| \| \| * \| \| \| \|	l10n: fr.po: Fix typos	Joachim Jablon	2017-02-04	1	-4/+4
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Joachim Jablon <ewjoachim@gmail.com>
\| \| * \| \| \| \|	l10n: ko.po: Update Korean translation	Changwoo Ryu	2017-02-11	1	-1320/+2617
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Changwoo Ryu <cwryu@debian.org>
\| \| * \| \| \|	l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)	Jiang Xin	2017-02-04	1	-1273/+2454
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.12.0-rc0 for git v2.12.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| * \| \| \|	Merge branch 'master' of git://github.com/git-l10n/git-po	Jiang Xin	2017-02-04	4	-3084/+5025
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/git-l10n/git-po: l10n: bg: Updated Bulgarian translation (2913t+0f+0u) l10n: fixes to Catalan translation l10n: zh_CN: review for git v2.11.0 l10n l10n: New Catalan translation maintainer
\| \| \| * \| \| \|	l10n: bg: Updated Bulgarian translation (2913t+0f+0u)	Alexander Shopov	2017-01-31	1	-2761/+4683
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alexander Shopov <ash@kambanaria.org>
\| \| \| * \| \| \|	Merge branch 'master' of https://github.com/Softcatala/git-po	Jiang Xin	2017-01-25	1	-289/+308
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/Softcatala/git-po: l10n: fixes to Catalan translation
\| \| \| \| * \| \| \|	l10n: fixes to Catalan translation	Jordi Mas	2017-01-03	1	-289/+308
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jordi Mas <jmas@softcatala.org>
\| \| \| * \| \| \| \|	l10n: zh_CN: review for git v2.11.0 l10n	Ray Chen	2017-01-02	1	-32/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| \| * \| \| \| \|	Merge branch 'master' of https://github.com/Softcatala/git-po	Jiang Xin	2017-01-02	1	-2/+3
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/Softcatala/git-po: l10n: New Catalan translation maintainer
\| \| \| \| * \| \| \|	l10n: New Catalan translation maintainer	Jordi Mas	2016-12-26	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jordi Mas <jmas@softcatala.org>