Am 12/9/2013 3:23, schrieb Brett Randall:
> * fixup! or squash! on it's own would default to fixing-up the
> previous commit (or result of previous step of rebase if that was a
> squash/fixup).
Why would you want that? To fixup the previous commit, just use 'git
commit --amend'. What am I missing?
From: Eric Sunshine
>
> On Sat, Dec 7, 2013 at 11:21 AM, Christian Couder
> wrote:
>> This patch adds tests for "git replace -l --format=".
>> Only tests when is 'medium' and 'full' are needed
>> because 'short' is the same as with no --format option.
>
> Nevertheless, don't you want to test th
On Sat, Dec 7, 2013 at 11:21 AM, Christian Couder
wrote:
> This patch adds tests for "git replace -l --format=".
> Only tests when is 'medium' and 'full' are needed
> because 'short' is the same as with no --format option.
Nevertheless, don't you want to test that it behaves in the expected
mann
Hi,
I am using Git 1.8.4.3 compiled by me on OEL6. I'd like to be able to
use rebase --autosquash like this:
==
# git log
commit b94f970cd869dfbf5254b19867fa7200df732d4f
Author: Me
Date: Mon Dec 9 17:02:32 2013 -0800
fixup!
This is a second fixup.
commit 64e516c
Hi Jonathan,
On Sun, Dec 8, 2013 at 5:30 PM, Jonathan Nieder wrote:
> git-subtree and its documentation are in the contrib/subtree
> directory. contrib/subtree/Makefile includes rules to build
> a manpage for it.
Thanks - I guess git-manpages generally doesn't include bits from contrib then.
>
On Sun, Dec 8, 2013 at 12:06 PM, John Keeping wrote:
> Commit 15a147e (rebase: use @{upstream} if no upstream specified,
> 2011-02-09) says:
>
> Make it default to 'git rebase @{upstream}'. That is also what
> 'git pull [--rebase]' defaults to, so it only makes sense that
>
On Sun, Dec 08, 2013 at 02:40:13PM -0800, Jonathan Nieder wrote:
> brian m. carlson wrote:
>
> > Oftentimes people will make the same change in two branches, revert
> > the change in one branch, and then be surprised when a merge
> > reinstitutes that change when the branches are merged.
>
> Life
Hi,
brian m. carlson wrote:
> Oftentimes people will make the same change in two branches, revert the change
> in one branch, and then be surprised when a merge reinstitutes that change
> when
> the branches are merged.
Life is even more complicated: if the merge-base chosen happens to be
a des
Hi,
Stefanus Du Toit wrote:
> The git-subtree manpage is currently missing from the git-manpages
> tarballs at https://code.google.com/p/git-core/.
>
> For example,
> https://code.google.com/p/git-core/downloads/detail?name=git-manpages-1.8.5.1.tar.gz
> does not include it.
>
> A side effect of
Hi,
Nguyễn Thái Ngọc Duy wrote:
> After a86a8b9 (sb/parseopt-boolean-removal), the deprecated
> OPT_BOOLEAN is not used anywhere except by OPT__* macros.
Yeah, I noticed the same thing too recently.
[...]
> All OPT__DRY_RUN call
> sites have been che
Bug description: On Windows, when the git client is attempting to communicate
via https to an apache server that happens to be on the same machine
(localhost), the client connection will hang for about 2 minutes before
completing. Connecting via https to non-localhost git server returns
immedi
Oftentimes people will make the same change in two branches, revert the change
in one branch, and then be surprised when a merge reinstitutes that change when
the branches are merged. Add an explanatory paragraph that explains that this
occurs and the reason why, so people are not surprised.
Sign
On Sun, Nov 03, 2013 at 04:54:16PM +0100, Nicolas Vigier wrote:
> Hello,
>
> Here is a series of patches to add the --gpg-sign option to be able to
> gpg sign commits, to the cherry-pick, revert, am and rebase commands.
Whatever happened to this series? It looks like it never made it into
next,
Signed-off-by: brian m. carlson
---
Documentation/RelNotes/1.9.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/RelNotes/1.9.txt b/Documentation/RelNotes/1.9.txt
index 9debcc4..d5c99a9 100644
--- a/Documentation/RelNotes/1.9.txt
+++ b/Documentation/RelNotes/1.
Commit 15a147e (rebase: use @{upstream} if no upstream specified,
2011-02-09) says:
Make it default to 'git rebase @{upstream}'. That is also what
'git pull [--rebase]' defaults to, so it only makes sense that
'git rebase' defaults to the same thing.
but that isn't actuall
The git-subtree manpage is currently missing from the git-manpages
tarballs at https://code.google.com/p/git-core/.
For example,
https://code.google.com/p/git-core/downloads/detail?name=git-manpages-1.8.5.1.tar.gz
does not include it.
A side effect of this is that "git help subtree" fails when u
Greetings to you,
I want you to assist me in transferring the sum of US$9.5M left behind by my
dead client. I am willing to offer 50% to you as the sole beneficiary after the
funds has been transferred to you.
Get back to me if you are interested so that i can provide you with more details
Re
Since commit d96855f (merge-base: teach "--fork-point" mode, 2013-10-23)
we can replace a shell loop in git-pull with a single call to
git-merge-base. So let's do so.
Signed-off-by: John Keeping
---
git-pull.sh | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/git-pu
Karsten Blees writes:
> Am 07.12.2013 23:23, schrieb Thomas Rast:
>> Karsten Blees writes:
>>
>>> Extending 'struct hashmap_entry' with an int-sized member shouldn't waste
>>> memory on 64-bit systems. This is already documented in api-hashmap.txt,
>>> but needs '__attribute__((__packed__))' to
From: "Felipe Contreras"
The 'upstream' variable doesn't hold an "upstream", but a branch, so
make it clearer.
Signed-off-by: Felipe Contreras
---
sha1_name.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index e9c2999..e27db88
20 matches
Mail list logo
