Age | Commit message (Collapse) | Author | Files | Lines |
|
* jz/gitweb-conf-doc-fix:
gitweb.conf.txt: say "build-time", not "built-time"
|
|
* jk/cherry-pick-docfix:
cherry-pick: fix docs describing handling of empty commits
|
|
* iu/fix-parse-options-h-comment:
parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
|
|
* jg/cguide-we-cannot-count:
CodingGuidelines: update 'rough' rule count
|
|
Changed inaccurate count of "rough rules" from three to the more
generic 'a few'.
Signed-off-by: Julian Gindi <juliangindi@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
git l10n 2.4.0-rnd2
|
|
* 'master' of git://github.com/alexhenrie/git-po:
l10n: ca.po: update translation
|
|
Repository URL of zh_CN l10n for Git has been changed over 2 years,
update po/TEAMS for it.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
|
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
|
|
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
|
|
Translate one message came from git.pot update in 6eebb35
(l10n: git.pot: v2.4.0 round 2 (1 update)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
|
|
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
|
|
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
|
|
Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'
l10n: de.po: translate 99 new messages
l10n: de.po: fix messages with abbreviated hashs
l10n: de.po: add space before ellipsis
l10n: vi.po: Updated Vietnamese translation
l10n: zh_CN: translations for git v2.4.0-rc0
l10n: fr.po v2.4.0-rc0 round 1
l10n: ca.po: update translation
l10n: ru: updated Russian translation
l10n: sv.po: Update Swedish translation (2305t0f0u)
l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)
l10n: ru: added Russian translation
l10n: de.po: fix negation for commit -a with paths
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* sb/atomic-push:
send-pack: unify error messages for unsupported capabilities
|
|
If --signed is not supported, the error message names the remote
"receiving end". If --atomic is not supported, the error message
names the remote "server". Unify the naming to "receiving end"
as we're in the context of "push".
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
The use of 'symbolische Verknüpfung' for 'symbolic link' is more common
than 'symbolischer Verweis'.
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
Translate 99 messages came from git.pot update in c2ea120
(l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
The three dots in messages where the hash is abbreviated
were misinterpreted and are fixed with this commit.
Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* ss/pull-rebase-preserve:
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
docs: clarify "preserve" option wording for git-pull
|
|
Code clean-up.
* jc/report-path-error-to-dir:
report_path_error(): move to dir.c
|
|
* ph/push-doc-cas:
git-push.txt: clean up force-with-lease wording
|
|
"build-time" is used everywhere else.
Signed-off-by: Jérôme Zago <git-patch@agt-the-walker.net>
Reviewed-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Commit b27cfb0 (git-cherry-pick: Add keep-redundant-commits
option, 2012-04-20), added the --keep-redundant-commits
option, and switched the default behavior (without that
option) to silently ignore empty commits. Later, the second
half of that commit was reverted in ac2b0e8 (cherry-pick:
regression fix for empty commits, 2012-05-29), but the
documentation added for --keep-redundant-commits was never
updated to match. Let's do so now.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
|
|
Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
* 'fr-v2.4.0-rc0' of git://github.com/jnavila/git:
l10n: fr.po v2.4.0-rc0 round 1
|
|
Ignoring a merge can be read as ignoring the changes a merge commit
introduces altogether, as if the entire side branch the merge commit
merged was removed from the history. But that is not what happens
if "-p" is not specified. What happens is that the individual
commits a merge commit introduces are replayed in order, and only
any possible merge conflict resolutions or manual amendments to the
merge commit are ignored.
Get this straight in the docs.
Also, do not say that merge commits are *tried* to be recreated. As that is
true almost everywhere it is better left unsaid.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
|
|
When 20d1c652 (parse-options: remove unused OPT_SET_PTR, 2014-03-30)
removed OPT_SET_PTR, the comment in the header that describes what
the option did to defval field was left behind by mistake. Remove
it.
Signed-off-by: Ivan Ukhov <ivan.ukhov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
|
* maint:
Prepare for 2.3.5
2.3.2 release notes: typofix
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* ph/push-doc-cas:
git-push.txt: clean up force-with-lease wording
|
|
* ss/pull-rebase-preserve:
docs: clarify "preserve" option wording for git-pull
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Code clean-up.
* sg/completion-gitcomp-nl-for-refs:
completion: use __gitcomp_nl() for completing refs
|
|
Code simplification.
* jk/simplify-csum-file-sha1fd-check:
sha1fd_check: die when we cannot open the file
|
|
A test fix.
* tg/test-index-v4:
t1700: make test pass with index-v4
|
|
Doc clean-up.
* nd/doc-git-index-version:
git.txt: list index versions in plain English
|
|
The prompt script (in contrib/) did not show the untracked sign
when working in a subdirectory without any untracked files.
* ct/prompt-untracked-fix:
git prompt: use toplevel to find untracked files
|
|
Even though "git grep --quiet" is run merely to ask for the exit
status, we spawned the pager regardless. Stop doing that.
* ws/grep-quiet-no-pager:
grep: fix "--quiet" overwriting current output
|