Re: Seeing git history of file including merge changes

I asked the following question on StackOverflow a while ago, but did not receive any answers so I'll try here. We have git repository where a file was changed on a topic branch and this branch was then merged back into the main branch. Due to various reasons the merge was made wrongly and as a

Re: fatal: ambiguous argument 'HEAD^': unknown revision or path not in the working tree.

On Wed, Sep 09, 2015 at 01:34:03AM -0700, davilda_ wrote: > i'm new with git and i just want to cancel a commit. I just do git add and > git commit. > How can i canceled a commit in my case. Usually with "git reset HEAD^". But I'm guessing from your subject line that you tried that, and it did

Re: Standardization of messages - dot after the sentence

Junio C Hamano venit, vidit, dixit 08.09.2015 20:16: > Michael J Gruber writes: > >> sigo venit, vidit, dixit 05.09.2015 14:22: >>> I've found really "little bug" with dots in the git output. >>> >>> $ git push >>> Everything up-to-date >>> >>> git pull >>> Already

Cher utilisateur de messagerie Web.

Cher utilisateur de messagerie Web. Nous avons un problème technique, nous notre base de date pour le moment. vous êtes au CLIQUEZ ICI pour vous reconfirmer web compte de messagerie une fois de plus. Help desk -- To unsubscribe from this list: send the

Re: Seeing git history of file including merge changes

On Wed, Sep 09, 2015 at 11:26:47AM +0300, Dov Grobgeld wrote: > The file was changed in commit B and the changes were undone in commit M. > > My problem is how to view the changes to the file between a specific > commit, e.g. B and another commit in its "downstream", e.g. H. > > If you do > >

Re: Bug report: GIT PRO/Branches chapter

Hi Robert, On 2015-09-09 08:11, Robert Macháček wrote: > Just reading this chapter: > https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell > > I believe that: Figure 3-9. Divergent history > (https://git-scm.com/book/en/v2/book/03-git-branching/images/advance-master.png) > does

Re: Bug report: GIT PRO/Branches chapter

Hi Johannes, Sorry, I am new to git, I have just followed instructions at https://git-scm.com/community which says: Mailing List Questions or comments for the Git community can be sent to the mailing list by using the email address git@vger.kernel.org. Bug reports should be sent to this mailing

Re: Bug report: GIT PRO/Branches chapter

On Wed, Sep 09, 2015 at 03:16:38PM +0700, Robert Macháček wrote: > Sorry, I am new to git, I have just followed instructions at > https://git-scm.com/community which says: > > Mailing List > Questions or comments for the Git community can be sent to the mailing > list by using the email address

Bug report: GIT PRO/Branches chapter

Hi, Just reading this chapter: https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell I believe that: Figure 3-9. Divergent history (https://git-scm.com/book/en/v2/book/03-git-branching/images/advance-master.png) does not show the final "2 branch situation" as described in the

Bug report: Add submodule with --branch and --depth (git version 2.5.0.windows.1)

Hi, I am trying to add a submodule with option --branch and --depth together, and failed. However, there is no problem if only one of them is applied. So, this worked: git submodule add --branch develop https://an...@bitbucket.org/anton/mysubmodule.git This is also worked: git submodule

Re: fatal: ambiguous argument 'HEAD^': unknown revision or path not in the working tree.

Hi, i'm new with git and i just want to cancel a commit. I just do git add and git commit. How can i canceled a commit in my case. Best regards -- View this message in context:

[PATCH v4 0/5] git-p4: add support for large file systems

From: Lars Schneider Diff to v3: * add large file system mock class for testing (Thanks Luke!) * add early exit for compressed threshold: If a file is smaller then the threshold then we don't need to compress it. Thanks, Lars Lars Schneider (5): git-p4: add

[PATCH v4 1/5] git-p4: add optional type specifier to gitConfig reader

From: Lars Schneider The functions “gitConfig” and “gitConfigBool” are almost identical. Make “gitConfig” more generic by adding an optional type specifier. Use the type specifier “—bool” with “gitConfig” to implement “gitConfigBool. This prepares the implementation

[PATCH v4 2/5] git-p4: add gitConfigInt reader

From: Lars Schneider Add a git config reader for integer variables. Please note that the git config implementation automatically supports k, m, and g suffixes. Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11

[PATCH v4 3/5] git-p4: return an empty list if a list config has no values

From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-p4.py b/git-p4.py index 40ad4ae..90d3b90 100755 --- a/git-p4.py +++ b/git-p4.py @@ -638,6 +638,8 @@ def

[PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

This is a backport of the corresponding patch to the builtin am in 2.6: 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, 2015-08-19). Reportedly, it can make a huge difference on Windows, in one case a `git rebase --skip` took 1m40s without, and 5s with, this patch.

Re: [PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Hi Junio, On 2015-09-09 11:10, Johannes Schindelin wrote: > This is a backport of the corresponding patch to the builtin am in 2.6: > 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, > 2015-08-19). > > Reportedly, it can make a huge difference on Windows, in one case a `git >

Re: Git's inconsistent command line options

Stefan Beller venit, vidit, dixit 01.09.2015 19:56: > On Tue, Sep 1, 2015 at 10:50 AM, Barry Warsaw wrote: >> On Sep 01, 2015, at 09:42 AM, Junio C Hamano wrote: >> >>> That way, you are forcing all the existing scripts to be updated to >>> say "git -c ..." for _all_ invocations

Re: Git's inconsistent command line options

David Aguilar venit, vidit, dixit 01.09.2015 11:28: > On Mon, Aug 31, 2015 at 10:25:58AM -0400, Barry Warsaw wrote: >> On Aug 31, 2015, at 05:10 PM, Duy Nguyen wrote: >> >>> I'm probably shot down for this. But could we go with a clean plate >>> and create a new command prefix (something like

[PATCH v4 4/5] git-p4: add support for large file systems

From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as Git LFS [1], Git Fat [2], or Git Media [2] try to address this problem. Add a generic

[PATCH v4 5/5] git-p4: add Git LFS backend for large file system

From: Lars Schneider Add example implementation including test cases for the large file system using Git LFS. Pushing files to the Git LFS server is not tested. Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 4 +- git-p4.py

Re: [PATCHv1 0/2] git-p4: work on a detached head

I wanted to play with the patch and apply it to my source but the process is really complicated for me. I wonder if you can give me a few recommendations how to work efficiently with email patches. I don’t want to start a flame-war about what email client is “right", I am just curious how you

[ANNOUNCE] Git Rev News edition 7

Hi everyone, I'm happy announce that the 7th edition of Git Rev News is now published: https://git.github.io/rev_news/2015/09/09/edition-7/ Thanks a lot to all the contributors! Enjoy, Christian, Thomas and Nicola. -- To unsubscribe from this list: send the line "unsubscribe git" in the body

[PATCH] gitk: accelerators for the main menu

This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a new view). Signed-off-by: Giuseppe Bilotta --- gitk | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gitk b/gitk index

[PATCH] apply: comment grammar fix

Signed-off-by: Giuseppe Bilotta --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 54aba4e..4aa53f7 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -785,7 +785,7 @@ static int

Re: [PATCH v1 1/2] git-p4: print stderr if P4 read_pipe operation fails

larsxschnei...@gmail.com writes: > From: Lars Schneider > > If read_pipe crashes then the caller can inspect the error and handle > it appropriately. > > Signed-off-by: Lars Schneider > --- > git-p4.py | 4 ++-- > 1 file changed, 2

Re: fatal: ambiguous argument 'HEAD^': unknown revision or path not in the working tree.

Jeff King writes: > The "simplest" way to do that is: > > rm .git/refs/heads/master > > but that is not guaranteed to work in future versions of git, and I > wouldn't recommend it in general. Yeah, "git checkout -b" has a stronger sibling "git checkout -B" (i.e. I know that the

--progress option for git submodule update?

Hi, Git submodule doesn’t have a --progress option like regular clone/fetch does. This means that it can hang a long time without output as it’s transferring data, particularly for large repositories. This is problematic in automation scenarios where there can be upper-bounds on how long a

Re: --progress option for git submodule update?

So submodules... I am currently working on improving submodules (some basic performance improvements have been done, soon to be merged upstream, I currently try to get parallelism working for git fetch --recurse-submodules and for git submodule update eventually. I sent some early working patches

Re: [PATCHv1 0/2] git-p4: work on a detached head

On Wed, Sep 9, 2015 at 5:03 AM, Lars Schneider wrote: > I wanted to play with the patch and apply it to my source but the process is > really complicated for me. I wonder if you can give me a few recommendations > how to work efficiently with email patches. I don’t

Re: [PATCHv1 0/2] git-p4: work on a detached head

On Wed, Sep 9, 2015 at 6:57 PM, Jacob Keller wrote: > On Wed, Sep 9, 2015 at 5:03 AM, Lars Schneider > wrote: >> I wanted to play with the patch and apply it to my source but the process is >> really complicated for me. I wonder if you can give

Re: --progress option for git submodule update?

> On Sep 9, 2015, at 4:40 PM, Stefan Beller wrote: > > So submodules... > > I am currently working on improving submodules (some basic performance > improvements have been done, soon to be merged upstream, I currently > try to get parallelism working for git fetch

Re: [PATCH v1 1/2] git-p4: print stderr if P4 read_pipe operation fails

On 09 Sep 2015, at 18:00, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> If read_pipe crashes then the caller can inspect the error and handle >> it appropriately. >> >> Signed-off-by: Lars Schneider

Re: [PATCH v4 4/5] git-p4: add support for large file systems

Lars Schneider writes: >> Also the exact format of these attributes entries looks like very >> closely tied to GitHub LFS and not generic (for example, there is no >> reason to expect that any large-file support would always use the >> "filter" mechanism or the

What's cooking in git.git (Sep 2015, #02; Wed, 9)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The first release candidate 2.6-rc1 has been tagged. Let's make sure we catch any possible regressions from now on, without getting distracted

Re: [ANNOUNCE] Git v2.6.0-rc1

Junio C Hamano writes: > * After "git am" without "-3" stops, running "git am -" pays attention Is this a typo for ---> "git am -3"? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

On Tue, Sep 8, 2015 at 11:50 PM, Junio C Hamano wrote: > Matthieu Moy writes: > This line still looks overlong. Would it help to stop spelling this as a double "a = b = overlong expression" assignment? >>> >>> I'm not sure, I get

Re: [PATCH v4 4/5] git-p4: add support for large file systems

larsxschnei...@gmail.com writes: > @@ -2226,17 +2355,16 @@ class P4Sync(Command, P4UserMap): > text = regexp.sub(r'$\1$', text) > contents = [ text ] > > -self.gitStream.write("M %s inline %s\n" % (git_mode, relPath)) > +if relPath == '.gitattributes':

Re: [PATCH v4 4/5] git-p4: add support for large file systems

On 09 Sep 2015, at 19:20, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> @@ -2226,17 +2355,16 @@ class P4Sync(Command, P4UserMap): >> text = regexp.sub(r'$\1$', text) >> contents = [ text ] >> >> -self.gitStream.write("M %s

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

Ehh, I was only kidding, though... On Wed, Sep 9, 2015 at 10:37 AM, Karthik Nayak wrote: > On Tue, Sep 8, 2015 at 11:50 PM, Junio C Hamano wrote: >> Matthieu Moy writes: >> > This line still looks overlong. Would it

Re: [PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Johannes Schindelin writes: > On 2015-09-09 11:10, Johannes Schindelin wrote: >> This is a backport of the corresponding patch to the builtin am in 2.6: >> 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, >> 2015-08-19). >> >> Reportedly, it can make

Re: [PATCHv1 2/2] git-p4: work with a detached head

Luke Diamand writes: > def run(self, args): > if len(args) == 0: > self.master = currentGitBranch() > -if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" > % self.master): > -die("Detecting current git branch