mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 06:54:55 +01:00
Code Activity
30144 commits 6 branches 956 tags 531 MiB
Commit graph

30144 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nguyễn Thái Ngọc Duy
422cad0ab1 i18n: name-rev: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
6c54dc46aa i18n: mv: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
a631281022 i18n: mktree: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
962e629567 i18n: merge: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
c7d93da38e i18n: merge-file: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
f037dbf49c i18n: merge-base: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
373f922174 i18n: ls-tree: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
377adc3aaf i18n: ls-files: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy
e62cd35a3e i18n: log: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
ce4a5e53d5 i18n: init-db: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
68918696cc i18n: help: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
483bbf41ca i18n: hash-object: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
4b407bc506 i18n: grep: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
6705c1629c i18n: gc: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
cf8fe315e6 i18n: fsck: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
61007a5868 i18n: format-patch: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
18913521e2 i18n: for-each-ref: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
93eced6c1b i18n: fmt-merge-msg: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy
719acedba4 i18n: fetch: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
3b787b9678 i18n: fast-export: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
bfb0737d96 i18n: describe: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
1bd31ce691 i18n: config: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
7adaddc21a i18n: count-objects: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
9c23f4c537 i18n: commit: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
997f44d0dc i18n: column: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
32b77add95 i18n: clone: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
145f9c81aa i18n: clean: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
986d1bb877 i18n: cherry: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy
e05a10937c i18n: checkout: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
0ed217188d i18n: checkout-index: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
5a72beb791 i18n: check-attr: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
d68faec7c0 i18n: cat-file: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
24a8521459 i18n: branch: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
efd2a8bd38 i18n: blame: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
1b56024c7a i18n: add: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
9e7bbe2d6b i18n: bisect--helper: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
0012a3873b i18n: archive: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy
a054e04912 i18n: mark "style" in OPT_COLUMN() for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:14 -07:00
Junio C Hamano
9a27f96705 precompose-utf8: do not call checks for non-ascii "utf8" 
As suggested by Linus, this function is not checking UTF-8-ness of the
string; it only is seeing if it is pure US-ASCII.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 11:12:58 -07:00
Junio C Hamano
889d35899b Git 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-19 17:02:11 -07:00
Junio C Hamano
d1e1fe7569 git-config doc: unconfuse an example 
One fictitious command "proxy-command" is enclosed inside a double
quote pair, while another fictitious command "default-proxy" is not
in the example, but the quoting does not change anything in the pair
of examples.  Remove the quotes to avoid unnecessary confusion.

Noticed by Michael Haggerty.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-18 16:39:35 -07:00
Michael Haggerty
d0714cc87b git-config.txt: fix example 
The "--add" option is required to add a new value to a multivalued
configuration entry.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-18 13:44:58 -07:00
Junio C Hamano
91e4bfe96f Merge branch 'jc/doc-git-updates' (early part) 
* 'jc/doc-git-updates' (early part):
  Documentation: update URL for formatted pages
 2012-08-17 13:27:10 -07:00
Junio C Hamano
7687ae98e0 Documentation: update the introductory section 
The second paragraph in the git(1) description section were meant to
guide people who are not ready to dive into this page away from here.
Referring migrating CVS users to another page before they get
acquainted with Git was somewhat out of place.  Move the reference to
the "FURTHER DOCUMENTATION" section and push that section down.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-17 13:26:20 -07:00
Junio C Hamano
c70c09b6fc Documentation: update URL for formatted pages 
The one at kernel.org has not been updated for quite a while and
can no longer be called "the latest".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-17 13:25:43 -07:00
Phil Hord
743bf6d8b0 stash: invoke rerere in case of conflict 
"stash apply" directly calls a backend merge function which does not
automatically invoke rerere.  This confuses mergetool when leftover
rerere state is left behind from previous merges.

Invoke rerere explicitly when we encounter a conflict during stash
apply.  This turns the test introduced by the previous commit to
succeed.

Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-17 10:59:17 -07:00
Phil Hord
79dc2d0b02 test: git-stash conflict sets up rerere 
Add a test to make sure that a conflicted "stash apply" invokes
rerere to record the conflicts and resolve the the files it can
(the current code doesn't, so the test is marked as failing).

Without correct state recorded for rerere, mergetool may be
confused, causing it to think no files have conflicts even though
they do.  This condition is not verified by this test since a
subsequent commit will change the behavior to enable rerere for
stash conflicts.

Also, the next test expected us to finish up with a reset, which is
impossible to do if we fail (as we must) and it's an unreasonable
expectation anyway.  Begin the next test with a reset of its own
instead.

Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-17 10:56:19 -07:00
Robin Rosenberg
5f8580ad47 cleanup precompose_utf8 
- Remove extraneous parentheses and braces;

 - Remove redundant NUL-termination before strcpy();

 - Check result of unlink when probing for decomposed file names;

 - Adjust for the coding style by adding missing whitespaces;

 - Move storage class "static" at the beginning of the decl.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-17 10:29:56 -07:00
Miklos Vajna
d9aa361043 man: git pull -r is a short for --rebase 
Letting the "--rebase" option squat on the short-and-sweet single
letter option "-r" was an unintended accident and was not even
documented, but the short option seems to be already used in the
wild. Let's document it so that other options that begin with "r"
would not be tempted to steal it.

Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-17 00:26:52 -07:00
Junio C Hamano
9c81990bdd gitcli: describe abbreviation of long options 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-16 23:16:28 -07:00