t;> ...
>
> Your problem is not the presence of "--merges" here, but that you forgot
> the necessary "file" argument. Try "git blame --merges foo.c".
Oops. Thanks.
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthew
-rev-list(1)
...
$ git help rev-list | grep -F -e --merges
[ --merges ]
--merges
--min-parents=2 is the same as --merges.
--max-parents=0 gives all
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile
never want to let Git delete the underlying commit objects since
there could be Gitweb links pointing at them.
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message
to
> take both histories into account.
>
> So I guess it is not such a great idea.
The particular proposed implementation? Or the broader idea to save
loose commits more permanently? I'm still interested in a solution for
the latter.
--
Matt McClure
http://matthewlmcclure.com
http://w
refused to merge only if the commits
themselves prevented fast-forwarding?
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
Mo
On Wed, May 8, 2013 at 12:05 PM, Matt McClure wrote:
> On Wed, May 8, 2013 at 10:41 AM, Johannes Sixt wrote:
>> git gc moves unreachable objects that were packed before to the loose
>> object store, from where they can be pruned.
>
> Thanks. That was the piece I was missi
On Wed, May 8, 2013 at 12:05 PM, Matt McClure wrote:
> On Wed, May 8, 2013 at 10:41 AM, Johannes Sixt wrote:
>> git gc moves unreachable objects that were packed before to the loose
>> object store, from where they can be pruned.
>
> Thanks. That was the piece I was missi
On Wed, May 8, 2013 at 10:41 AM, Johannes Sixt wrote:
> git gc moves unreachable objects that were packed before to the loose
> object store, from where they can be pruned.
Thanks. That was the piece I was missing. I assumed `git gc` did the opposite.
--
Matt McClure
http://matthewlmcclu
-beefcake01 panama.git]$ git fsck --unreachable | wc -l
9468
It looks like `git prune -n` is telling me that it would prune the objects
that I just packed. What am I misunderstanding?
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this
original series in a new series
of analogous commits?
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
ified, print a warning and exit with an error.
When there's a conflict, does difftool save both conflicting files? Or
only the working tree copy? I think it should preserve both copies on
disk.
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
xactly what I was describing here:
http://thread.gmane.org/gmane.comp.version-control.git/217979/focus=218006
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the line "unsubscribe git" in
the
atthewlmcclure.com/s/2013/03/14/use-emacs-dircmp-mode-as-a-git-difftool.html
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to maj
latform check?
> Does anyone want to take this and whip it into a proper patch?
An attempt:
>From 429ae282ffd7202b6d2fb024a92dea543b8af376 Mon Sep 17 00:00:00 2001
From: Matt McClure
Date: Wed, 13 Mar 2013 11:14:22 -0400
Subject: [PATCH] difftool: Make directory diff symlink working tree
...p
think you want some new mode of operation for difftool instead
> of this patch which will also affect unrelated commands.
Are you suggesting that difftool do the reset work above given a new
option or by default?
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.co
On Mar 12, 2013, at 1:25 PM, John Keeping wrote:
> When I tried this I got the expected behaviour even without this patch.
git diff --raw commit
emits the null SHA1 if the working tree file's stat differs from the
blob corresponding to commit. Is that the case you observed?
--
To unsubscrib
On Mar 12, 2013, at 4:16 PM, Junio C Hamano wrote:
> Matt McClure writes:
>
>> An alternative approach would be to reuse git-diff's option parsing
>
> I do not think you want to go there. That wouldn't solve the third
> case in my previous message, no?
I thin
On Tue, Mar 12, 2013 at 5:43 PM, Matt McClure wrote:
> On Tue, Mar 12, 2013 at 5:06 PM, John Keeping wrote:
>>
>> is it sufficient to say
>> "there is no more than one non-option to the left of '--' and '--cached'
>> is not among the options
here git-diff makes that choice, but if someone could point me in the
right direction, I think I'd actually prefer that approach. What do
you think?
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: se
On Tue, Nov 27, 2012 at 7:41 AM, Matt McClure wrote:
>
> On Tuesday, November 27, 2012, David Aguilar wrote:
>>
>> It seems that there is an edge case here that we are not
>> accounting for: unmodified worktree paths, when checked out
>> into the temporary direct
ood thing. Without it, the
directory diff tool would have no way to distinguish a file added in
the diff from a file that was preexisting and unmodified.
--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
--
To unsubscribe from this list: send the lin
21 matches
Mail list logo
