Hi,
i need to squash several commits into a single one in a automated way. I know
that there is interactive rebase, which can also be automated using
GIT_SEQUENCE_EDITOR. Unfortunately my history is very large and i need to
squash deep down in the history several times. So using interactive reb
Signed-off-by: Csaba Kiraly
---
git-gui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-gui.sh b/git-gui.sh
index f86a948..211f57f 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1977,7 +1977,7 @@ proc display_all_files {} {
if {!$files_warning} {
gui.maxfilesdisplayed (added in dd6451f9c7c5a36d3006231b618ac6da06c7c7b4)
was applied brute force on the file list in alphabetic order. As a result,
files that had modifications might not be displayed by git-gui. Even
worse, files that are already in the index might not be displayed, which
makes gi
On Wed, Oct 22, 2014 at 08:19:07PM +, Crabtree, Andrew wrote:
> I need to get a list of refs that can reach a certain SHA in in a script.
>
> git branch --contains SHA
>
> would be great (runs in ~2 seconds), but not my preferred option for
> scripting.
>
> I tried
>
> for br in $(git f
Ronnie Sahlberg writes:
> Subject: Re: [PATCH 01/15] refs.c make ref_transaction_create a wrapper to
> ref_transaction_update
Missing colon after "refs.c"
> commit 03001144a015f81db5252005841bb78f57d62774 upstream.
Huh?
> The ref_transaction_update function can already be used to create refs
Ronnie Sahlberg writes:
> commit 0beeda259297c92d411ecc92fa508ec7cfd87cc5 upstream.
>
> Change-Id: I685291986e544a8dc14f94c73b6a7c6400acd9d2
> Signed-off-by: Ronnie Sahlberg
> Signed-off-by: Jonathan Nieder
> ---
> refs.c | 22 ++
> refs.h | 2 +-
> 2 files changed, 3 inse
On Thu, Oct 23, 2014 at 10:42 AM, Junio C Hamano wrote:
> Ronnie Sahlberg writes:
>
>> Subject: Re: [PATCH 01/15] refs.c make ref_transaction_create a wrapper to
>> ref_transaction_update
>
> Missing colon after "refs.c"
>
>> commit 03001144a015f81db5252005841bb78f57d62774 upstream.
>
> Huh?
>
>
Ronnie Sahlberg writes:
> commit 1bfd3091a3d95a6268894182117eed823217dd9d upstream.
>
> Add a field that describes what type of update this refers to. For now
> the only type is UPDATE_SHA1 but we will soon add more types.
OK, so the idea is that 03/15 and 07/15 that let callers to say
transacti
Ronnie Sahlberg writes:
> commit 306805ccd147bfdf160b288a8d51fdf9b77ae0fa upstream.
>
> Update copy_fd to return a meaningful errno on failure.
These two are good changes, but makes me wonder if more places
benefit from having error_errno() that does the "save away errno,
use strerror(errno) to
Ronnie Sahlberg writes:
> On Thu, Oct 23, 2014 at 10:42 AM, Junio C Hamano wrote:
>> Ronnie Sahlberg writes:
>>
>>> Subject: Re: [PATCH 01/15] refs.c make ref_transaction_create a
>>> wrapper to ref_transaction_update
>>
>> Missing colon after "refs.c"
>> ...
>>> Change-Id: I687dd47cc4f4e06766e
On Thu, Oct 23, 2014 at 10:51 AM, Junio C Hamano wrote:
> Ronnie Sahlberg writes:
>
>> commit 306805ccd147bfdf160b288a8d51fdf9b77ae0fa upstream.
>>
>> Update copy_fd to return a meaningful errno on failure.
>
> These two are good changes, but makes me wonder if more places
> benefit from having e
Jeff King writes:
> On Wed, Oct 22, 2014 at 08:19:07PM +, Crabtree, Andrew wrote:
>
>> I need to get a list of refs that can reach a certain SHA in in a script.
>>
>> git branch --contains SHA
>>
>> would be great (runs in ~2 seconds), but not my preferred option for
>> scripting.
>>
>>
Ronnie Sahlberg writes:
> commit 020ed65a12838bdead64bc3c5de249d3c8f5cfd8 upstream.
>
> When performing a reflog transaction update, only write to the reflog iff
> msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform
> an update that only truncates but does not write.
Does
Hello,
For the past 8 months I've been working on the process and tooling to convert
the Kuali Student subversion repository into Git and to support CI on pull
requests with auto merge to trunk once the builds were green and the
appropriate sign-off provided.
The Kuali Student project is bein
Hi,
I'm currently developing a local web based GUI for git in the same
fashion as mercurial's 'hg serve': git-webui
(https://github.com/alberthier/git-webui)
I tried to add word-diff highlighting in my diff visualization panels.
I used the '--word-diff=porcelain' option of 'git show' and 'git
diff
Ronnie Sahlberg writes:
> @@ -3531,7 +3537,7 @@ struct ref_update {
> enum transaction_update_type update_type;
> unsigned char new_sha1[20];
> unsigned char old_sha1[20];
> - int flags; /* REF_NODEREF? */
> + int flags; /* REF_NODEREF? or private flags */
Not a very in
The man page for git-credential-store at
http://git-scm.com/docs/git-credential-store
and
https://www.kernel.org/pub/software/scm/git/docs/git-credential-store.html
incorrectly state that the option to change the credential storage path is
'--store'. The name of the option should be '--file'. I
Windows does not necessarily mean Cygwin, it could also be MSYS. The
latter ships with a version of "kill" that does not understand "-f". In
msysgit this was addressed shipping Cygwin's version of kill.
Properly fix this by using the stock Windows "taskkill" command instead,
which is available sin
I forgot to mention the version :
I tested with Ubuntu's git 1.9.1 and a 2.1.0 version I built myself
2014-10-23 20:54 GMT+02:00 Éric Alber :
> Hi,
>
> I'm currently developing a local web based GUI for git in the same
> fashion as mercurial's 'hg serve': git-webui
> (https://github.com/alberthier
Am 23.10.2014 um 14:34 schrieb Henning Moll:
> i need to squash several commits into a single one in a automated
> way. I know that there is interactive rebase, which can also be
> automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very
> large and i need to squash deep down in the hi
Greetings,
I am unable to find any documentation regarding the life cycle regarding
the various versions of git. Is only the current version supported?
What about older minor/major versions? At what point does a version go
EOL? Currently, is only 2.1.2 supported? I would entertain the thou
Am 23.10.2014 um 22:08 schrieb Johannes Sixt:
Use git-replace do construct a squashed commit that replaces the last
child in each run such that its parent points to the parent of the
first in the run. Then use a git-filterbranch without filters to burn
the parenthood into the history. -- Hannes
Commit 8796e182 ("receive-pack.c: use a single transaction when
atomic-push is negotiated", 21-10-2014) added the 'transaction'
and 'err' variables as external symbols.
Noticed by sparse. ("'err' was not declared. Should it be static?")
Signed-off-by: Ramsay Jones
---
Hi Ronnie,
If you need t
Guten Tag und Gott segne Sie.
Mein Name ist Frau Rose Wenger, ein Kaufmann in Dubai, in den Vereinigten
Arabischen Emiraten Ich habe mit Ösophagus-Krebs diagnostiziert worden. Es hat
alle Formen der medizinischen Behandlung besudelt, und im Moment habe ich nur
über ein paar Monate zu leben, na
Starting from a single file, A, if you create B as a copy of A (and
possibly make some edit) and then make extensive change to A, you
will see:
$ git diff -C --name-status
C89AB
M A
which is expected. However, if you ask the same question in a
different way, you see this
In a project with a submodule, if you merge two diverging branches in
which one branch updated which commit the submodule points to, and the
other branch moves the submodule to a new location, the resulting
merge error message does not provide information about what the
conflict was, or the path to
In a project with a submodule, if you merge two diverging branches in
which one branch updated which commit the submodule points to, and the
other branch moves the submodule to a new location, the resulting
merge error message does not provide information about what the
conflict was, or the path to
27 matches
Mail list logo
