Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.

Carlo Wood writes: > there seems to be a problem with using 'git commit --amend' in > git submodules when using 'git push --recurse-submodules=on-demand' > in the parent. > > The latter fails, saying "The following submodule paths contain changes > that can not be found on any

ITS Department !!!

ITS Department Administrator has currently upgraded all mailboxes (size to 20.0GB), fill details below to secure your mailbox and UPGRADE SPACE for more Storage. CLICK HERE: CLICK HERE TO UPGRADE System Help-Desk • Copyright © 2017 # • • ALL RIGHTS RESERVED.

git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.

Hi, there seems to be a problem with using 'git commit --amend' in git submodules when using 'git push --recurse-submodules=on-demand' in the parent. The latter fails, saying "The following submodule paths contain changes that can not be found on any remote:" for such submodule, even though the

[PATCH v2 4/4] stash: support filename argument

While working on a repository, it's often helpful to stash the changes of a single or multiple files, and leave others alone. Unfortunately git currently offers no such option. git stash -p can be used to work around this, but it's often impractical when there are a lot of changes over multiple

[PATCH v2 2/4] stash: introduce push verb

Introduce a new git stash push verb in addition to git stash save. The push verb is used to transition from the current command line arguments to a more conventional way, in which the message is specified after a -m parameter instead of being a positional argument. This allows introducing a new

[PATCH v2 1/4] Documentation/stash: remove mention of git reset --hard

Don't mention git reset --hard in the documentation for git stash save. It's an implementation detail that doesn't matter to the end user and thus shouldn't be exposed to them. In addition it's not quite true for git stash -p, and will not be true when a filename argument to limit the stash to a

[PATCH v2 0/4] stash: create filename argument

Previous round is at: http://public-inbox.org/git/20170121200804.19009-1-t.gumme...@gmail.com/. Thanks Junio, Peff, Øyvind, Jakub and Johannes for your feedback on the previous round. Changes since the previous round: - Re-phrased the Documentation update. - Added missing $ in 2/3 - Added an

[PATCH v2 3/4] introduce new format for git stash create

git stash create currently supports a positional argument for adding a message. This is not quite in line with how git commands usually take comments (using a -m flag). Add a new syntax for adding a message to git stash create using a -m flag. This is with the goal of deprecating the old style

Re: show all merge conflicts

On Sat, Jan 28, 2017 at 6:28 AM, Jeff King wrote: > On Fri, Jan 27, 2017 at 09:42:41PM -0800, G. Sylvie Davies wrote: > >> Aside from the usual "git log -cc", I think this should work (replace >> HEAD with whichever commit you are analyzing): >> >> git diff --name-only

Important

Hello , I have a business proposition for you,kindly email me via my private email for more details. Contact Email : ( irenegeorgia...@hellenicbankcy.com ) Best Regards Ms Irena A.Georgiadou

[RFC] Proof of concept: Support multiple authors

This patch is a proof of concept implementation of support for multiple authors. It adds an optional `authors` header to commits which is set when there are authors configured in the git config. A new command `git-authors` is used to manage the authors settings. Authors are identified by initials

Re: [PATCH v2] git-p4: Fix git-p4.mapUser on Windows

On 27 January 2017 at 17:33, Junio C Hamano wrote: > George Vanburgh writes: > >> From: George Vanburgh >> >> When running git-p4 on Windows, with multiple git-p4.mapUser entries in >> git config - no user mappings are applied to

Mrs. Rose Sambou

-- I am Mrs. Rose Sambou Please my dear, do not feel embarrassed by my mail to you. I am the wife of late Dr. Ivan Sambou a prominent business man and pro-human right activist here in Republic of Burkina Faso before his untimely death in 2010. During my late husband's lifetime, he deposited

Re: [PATCH 3/3] stash: support filename argument

On 01/23, Junio C Hamano wrote: > Thomas Gummerer writes: > > > diff --git a/git-stash.sh b/git-stash.sh > > index d6b4ae3290..7dcce629bd 100755 > > --- a/git-stash.sh > > +++ b/git-stash.sh > > @@ -41,7 +41,7 @@ no_changes () { > > untracked_files () { > >

[PATCH] receive-pack: call string_list_clear() unconditionally

string_list_clear() handles empty lists just fine, so remove the redundant check. Signed-off-by: Rene Scharfe --- builtin/receive-pack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 6b97cbdbe..1dbb8a069

Re: [PATCH 2/3] stash: introduce push verb

On 01/23, Junio C Hamano wrote: > Thomas Gummerer writes: > > > + stash_msg="$*" > > + > > + if test -z stash_msg > > A dollar-sign is missing here, I think. Yes, thanks. > > + then > > + push_stash $push_options > > + else > > + push_stash