Hi,
is there any chance to have 1.8 before 1.10 in an output like the following
:
...
From https://code.wireshark.org/review/wireshark
52fe0aa..b69642d master - origin/master
460db8a..540f061 master-1.10 - origin/master-1.10
25bb29a..5741a40 master-1.12 - origin/master-1.12
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 68b3cb2..ca45a84 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -351,4 +351,16 @@
Here is a small patch series to implement:
git replace [-f] --graft commit [parent...]
This patch series goes on top of the patch series that
implements --edit.
The changes since v3, thanks to Junio, are:
- remove function read_sha1_commit() and its call as well as a
call to
This patch adds into contrib/ an example script to convert
grafts from an existing grafts file into replace refs using
the new --graft option of git replace.
While at it let's mention this new script in the
git replace documentation for the --graft option.
Signed-off-by: Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 8
1 file changed, 8 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 61461b9..491875e 100644
--- a/Documentation/git-replace.txt
+++
The usage string for this option is:
git replace [-f] --graft commit [parent...]
First we create a new commit that is the same as commit
except that its parents are [parents...]
Then we create a replace ref that replace commit with
the commit we just created.
With this new option, it should be
Hi,
On Fri, Jun 06, 2014 at 11:15:04PM +0200, Karsten Blees wrote:
Am 06.06.2014 21:13, schrieb Junio C Hamano:
I am wondering why the solution is not a more obvious drop const
that is not ANSI C, though. I only have a ready-access to N1570
draft but in it I find:
Actually, that was
Fix const warnings in http-fetch.c and remote-curl.c main() where is
argv declared as const.
The fix should work for all future declarations of main, no matter
whether the second parameter's type is char**, const char**, or
char *[].
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
compat/mingw.h |
From: Karsten Blees bl...@dcon.de
Date: Fri, 7 Jan 2011 19:47:23 +0100
The code in the MinGW main macro is getting more and more complex, move to
a separate initialization function for readabiliy and extensibility.
Signed-off-by: Karsten Blees bl...@dcon.de
Signed-off-by: Erik Faye-Lund
Hi,
On Fri, Jun 06, 2014 at 10:18:43PM +0100, Peter Krefting wrote:
Stepan Kasal:
+switching to a TrueType font such as Lucida Console!);
[...]
modernizing the suggestion here to recomment Consolas. It is available
Indeed.
So, I'll keep this patch as it is, for the records, and
Hi,
I am working in a project, where I am using *Git*. Today, I have been advised
by my manager to do some change and it was an urgent request. I did the change
and tested also, All was working fine. The big mistake I did, all the changes I
made in the *master* branch without creating a topic
Junio C Hamano gits...@pobox.com writes:
git blame has been optimized greatly by reorganising the data
structure that is used to keep track of the work to be done, thanks
to David Karstrup d...@gnu.org.
I guess that reorganising the data structure for months is not worth
the trouble of
Am 07.06.2014 08:07, schrieb Arup Rakshit:
Hi,
I am working in a project, where I am using *Git*. Today, I have been advised
by my manager to do some change and it was an urgent request. I did the
change
and tested also, All was working fine. The big mistake I did, all the changes
I
From: Karsten Blees bl...@dcon.de
Date: Sat, 31 Jul 2010 00:04:01 +
WriteConsoleW seems to be the only way to reliably print unicode to the
console (without weird code page conversions).
Also redirects vfprintf to the winansi.c version.
Signed-off-by: Karsten Blees bl...@dcon.de
From: Karsten Blees bl...@dcon.de
Date: Fri, 25 Nov 2011 21:05:06 +0100
Add Unicode conversion functions to convert between Windows native UTF-16LE
encoding to UTF-8 and back.
To support repositories with legacy-encoded file names, the UTF-8 to UTF-16
conversion function tries to create valid,
From: Karsten Blees bl...@dcon.de
Date: Sat, 14 Jan 2012 22:24:19 +0100
Winansi.c has many static variables that are accessed and modified from
the [v][f]printf / fputs functions overridden in the file. This may cause
multi threaded git commands that print to the console to produce corrupted
From: Karsten Blees bl...@dcon.de
Date: Thu, 1 Mar 2012 21:53:54 +0100
As of Win32: Thread-safe windows console output, git-log no longer
terminates when the pager process dies. This is due to disabling buffering
for the replaced stdout / stderr streams. Git-log will periodically fflush
stdout
Hello,
this patch series is to be applied on top of move main() macro to a function,
discussed in another thread.
I added the two patches Karsten mentioned:
Win32: add Unicode conversion functions
Win32: fix broken pipe detection
I also copied the links for the fixups incuded.
Regards,
From: Karsten Blees bl...@dcon.de
Date: Sat, 31 Jul 2010 00:04:03 +
Unicode console output won't display correctly with default settings
because the default console font (Terminal) only supports the system's
OEM charset. Unfortunately, this is a user specific setting, so it cannot
be easily
From: Karsten Blees bl...@dcon.de
Date: Sat, 31 Jul 2010 00:04:02 +
GetStdHandle(STD_OUTPUT_HANDLE) doesn't work for stderr if stdout is
redirected. Use _get_osfhandle of the FILE* instead.
_isatty() is true for all character devices (including parallel and serial
ports). Check return value
It is sometimes desirable to insert several header lines at the top of
the body, e.g., if From or Date differs from the mail header.
(Linus even recommends to use this second header for all kernel
submissions.)
send-email has a minimal support for this; make sure it is not applied
when there is a
On Sat, Jun 07, 2014 at 08:05:34AM +0200, Toralf Förster wrote:
is there any chance to have 1.8 before 1.10 in an output like the
following :
...
From https://code.wireshark.org/review/wireshark
52fe0aa..b69642d master - origin/master
460db8a..540f061 master-1.10 -
On Sat, Jun 7, 2014 at 1:05 PM, Toralf Förster toralf.foers...@gmx.de wrote:
Hi,
is there any chance to have 1.8 before 1.10 in an output like the
following :
...
From https://code.wireshark.org/review/wireshark
52fe0aa..b69642d master - origin/master
460db8a..540f061
From: Atsushi Nakagawa at...@chejz.com
Kevin Bracey ke...@bracey.fi wrote:
On 01/06/2014 07:26, Atsushi Nakagawa wrote:
Kevin Bracey ke...@bracey.fi wrote:
The original git reset --hard used to be a pretty top-level
command.
It was used for aborting merges in particular. But I think it
'!f() { ... }; f' is a recommended pattern to declare more complex
aliases (see git wiki [1]). This commit teaches the completion to
handle them.
When determining which completion to use for an alias, the opening brace
is now ignored in order to continue the search for a git command inside
the
On Fri, Jun 6, 2014 at 12:34 PM, Junio C Hamano gits...@pobox.com wrote:
Steve Hoelzer shoel...@gmail.com writes:
instanceof() is listed as keywords, but there is no such thing (it is
in Java, though); in C# we use typeof(), 'is', and 'as for similar
purposes
You would need to balance the
26 matches
Mail list logo
