- 25 7月, 2015 1 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit d96a275b. It used to be possible to apply a patch series with "git am mbox" and then only after seeing a failure, switch to three-way mode via "git am -3" (no other options or arguments). The commit being reverted broke this workflow. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 7月, 2015 3 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* tf/gitweb-typofix: gitweb: fix typo in man page
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
l10n-2.5.0-rnd2 * tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po: l10n: ca.po: update translation l10n: de.po: translate 9 new messages l10n: Updated Bulgarian translation of git (2359t,0f,0u) l10n: zh_CN: for git v2.5.0 l10n round 2 l10n: sv.po: Update Swedish translation (2359t0f0u) l10n: fr v2.5.0 round 2 (2359t) l10n: ru.po: update Russian translation l10n: Updated Vietnamese translation (2359t) l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)
-
- 21 7月, 2015 1 次提交
-
-
由 Alex Henrie 提交于
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
-
- 18 7月, 2015 3 次提交
-
-
由 Junio C Hamano 提交于
Code clean-up. * jk/still-interesting: revision.c: remove unneeded check for NULL
-
由 Junio C Hamano 提交于
Update to the "linked checkout" in 2.5.0-rc1. Instead of "checkout --to" that does not do what "checkout" normally does, move the functionality to "git worktree add". As this makes the end-user experience of the "worktree add" more or less complete, I am tempted to say we should cook the other topic that removes the internal "new-worktree-mode" hack from "checkout" a bit longer in 'next', and release 2.5 final without that one. * es/worktree-add: Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference worktree: caution that this is still experimental Documentation/git-worktree: fix stale "git checkout --to" references
-
由 Eric Sunshine 提交于
This should have been changed by 93a36493 (Documentation: move linked worktree description from checkout to worktree, 2015-07-06). Signed-off-by: NEric Sunshine <sunshine@sunshineco.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 7月, 2015 2 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Eric Sunshine 提交于
These should have been changed to "git worktree add" by fc56361f (worktree: introduce "add" command, 2015-07-06. Signed-off-by: NEric Sunshine <sunshine@sunshineco.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 7月, 2015 17 次提交
-
-
https://github.com/ralfth/git-po-de由 Jiang Xin 提交于
* 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: translate 9 new messages
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
A hotfix to a new feature in 2.5.0-rc. * jc/diff-ws-error-highlight: diff: parse ws-error-highlight option more strictly
-
由 Junio C Hamano 提交于
Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary
-
由 Junio C Hamano 提交于
Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR
-
由 Junio C Hamano 提交于
* es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition
-
由 Junio C Hamano 提交于
A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning
-
由 Junio C Hamano 提交于
Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo
-
由 Junio C Hamano 提交于
* pt/t0302-needs-sanity: t0302: "unreadable" test needs SANITY prereq
-
由 Junio C Hamano 提交于
"git fetch --depth=<depth>" and "git clone --depth=<depth>" issued a shallow transfer request even to an upload-pack that does not support the capability. * me/fetch-into-shallow-safety: fetch-pack: check for shallow if depth given
-
由 Junio C Hamano 提交于
"git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function
-
由 Junio C Hamano 提交于
The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber
-
由 Junio C Hamano 提交于
Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X
-
由 Junio C Hamano 提交于
"git format-patch --ignore-if-upstream A..B" did not like to be fed tags as boundary commits. * jc/do-not-feed-tags-to-clear-commit-marks: format-patch: do not feed tags to clear_commit_marks()
-
由 Ralf Thielow 提交于
Translate 9 new messages came from git.pot update in a4156d20 (l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)). Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com> Acked-by: NPhillip Sz <phillip.szelat@gmail.com>
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>
-
- 15 7月, 2015 4 次提交
-
-
由 Jiang Xin 提交于
Update 9 translations (2359t0f0u) for git v2.5.0-rc2. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Peter Krefting 提交于
Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>
-
git://github.com/jnavila/git由 Jiang Xin 提交于
* 'fr_v2.5.0-round2' of git://github.com/jnavila/git: l10n: fr v2.5.0 round 2 (2359t)
-
由 Jean-Noel Avila 提交于
Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>
-
- 14 7月, 2015 9 次提交
-
-
https://github.com/DJm00n/git-po-ru由 Jiang Xin 提交于
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
-
由 Dimitriy Ryazantcev 提交于
Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
-
由 Tran Ngoc Quan 提交于
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>
-
由 Jiang Xin 提交于
Generate po/git.pot from v2.5.0-rc2 for git v2.5.0 l10n round 2. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
l10n-2.5.0-rnd1 * tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po: l10n: de.po: translate 65 new messages l10n: de.po: translate "index" as "Index" l10n: de.po: fix translation of "head nodes" l10n: zh_CN: for git v2.5.0 l10n round 1 l10n: ca.po: update translation l10n: fr.po v2.5.0-rc0 (2355t) l10n: Updated Bulgarian translation of git (2355t,0f,0u) l10n: sv.po: Update Swedish translation (2355t0f0u) l10n: Updated Vietnamese translation (2355t) l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Update to the "linked checkout" in 2.5.0-rc1. Instead of "checkout --to" that does not do what "checkout" normally does, move the functionality to "git worktree add". * es/worktree-add: (24 commits) Revert "checkout: retire --ignore-other-worktrees in favor of --force" checkout: retire --ignore-other-worktrees in favor of --force worktree: add: auto-vivify new branch when <branch> is omitted worktree: add: make -b/-B default to HEAD when <branch> is omitted worktree: extract basename computation to new function checkout: require worktree unconditionally checkout: retire --to option tests: worktree: retrofit "checkout --to" tests for "worktree add" worktree: add -b/-B options worktree: add --detach option worktree: add --force option worktree: introduce "add" command checkout: drop 'checkout_opts' dependency from prepare_linked_checkout checkout: make --to unconditionally verbose checkout: prepare_linked_checkout: drop now-unused 'new' argument checkout: relocate --to's "no branch specified" check checkout: fix bug with --to and relative HEAD Documentation/git-worktree: add EXAMPLES section Documentation/git-worktree: add high-level 'lock' overview Documentation/git-worktree: split technical info from general description ...
-
由 Junio C Hamano 提交于
"git checkout [<tree-ish>] <paths>" spent unnecessary cycles checking if the current branch was checked out elsewhere, when we know we are not switching the branches ourselves. * nd/multiple-work-trees: worktree: new place for "git prune --worktrees" checkout: don't check worktrees when not necessary
-
由 Junio C Hamano 提交于
Code simplification. * ss/clone-guess-dir-name-simplify: clone: simplify string handling in guess_dir_name()
-