table.
Signed-off-by: Beat Bolli
---
unicode_width.h | 17 -
update_unicode.sh | 2 +-
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/unicode_width.h b/unicode_width.h
index 73b5fd6..02207be 100644
--- a/unicode_width.h
+++ b/unicode_width.h
@@ -297,23 +297,6
A rerun of the previously fixed update-unicode.sh produces these new
tables.
Signed-off-by: Beat Bolli
---
unicode_width.h | 122 +++-
1 file changed, 111 insertions(+), 11 deletions(-)
diff --git a/unicode_width.h b/unicode_width.h
index
Checking just for the files' existence is not enough; we should also
download them if a newer version exists on the Unicode servers.
Signed-off-by: Beat Bolli
---
update_unicode.sh | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/update_unicode.sh b/update_unico
On 26.08.16 21:16, Stefan Beller wrote:
> On Fri, Aug 26, 2016 at 11:24 AM, Junio C Hamano wrote:
>> Beat Bolli writes:
>>
>>> In 175d38c (SubmittingPatches: document how to reference previous commits,
>>> 2016-07-28) the format for referring to older commits was
Amend the section on referencing previous commits with a hint to the
gitk command that was added exactly for this purpose.
Signed-off-by: Beat Bolli
---
Documentation/SubmittingPatches | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/SubmittingPatches b
In 175d38c (SubmittingPatches: document how to reference previous commits,
2016-07-28) the format for referring to older commits was specified.
Make the text generated by the "Copy commit summary" command match this
format.
Signed-off-by: Beat Bolli
Cc: Paul Mackerras
---
gitk-gi
Ilya Tumaykin gmail.com> writes:
> $ git --no-pager log -1 --format='format:%+s%+b'
> Please fix.
Simply use `git --no-pager log -1 --format='format:%+s%n%+b'`
The message body excludes the empty line preceding it.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bo
Junio C Hamano pobox.com> writes:
> + cd perf && $(MAKE) clean
I think the clean way to do this is
$(make) -C perf clean
Regards,
Beat
--
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 h
On 22.01.16 18:01, Johannes Schindelin wrote:
> The original patch was sent by Beat Bolli in
> http://thread.gmane.org/gmane.comp.version-control.git/281600
>
> My suggestion to extend it to respect gitattributes led to
> changes that broke the original patch.
>
> Since the
On 02.01.16 20:35, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Hmm, I have never used a Mac, so I'm just guessing here, but
>> you could try something like (obviously untested!):
>>
>> diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
>> index 245359a..68b306f 100755
>> --- a/t/t60
On 24.11.15 23:43, Beat Bolli wrote:
> On 24.11.15 09:21, Johannes Schindelin wrote:
>> Hi Beat,
>>
>> On Mon, 23 Nov 2015, Beat Bolli wrote:
>>
>>> When merging files in repos with core.eol = crlf, git merge-file inserts
>>> just a LF at the end of the
On 24.11.15 09:21, Johannes Schindelin wrote:
> Hi Beat,
>
> On Mon, 23 Nov 2015, Beat Bolli wrote:
>
>> When merging files in repos with core.eol = crlf, git merge-file inserts
>> just a LF at the end of the merge markers. Files with mixed line endings
>> cause
uot;binary
file matches".
Fixing this improves Git's behavior under Windows.
Signed-off-by: Beat Bolli
Cc: Johannes Schindelin
---
builtin/merge-file.c | 1 +
ll-merge.c| 1 +
t/t6023-merge-file.sh | 7 +++
xdiff/xdiff.h | 1 +
xdiff/xmerge.c| 29 +++
On 10.11.15 10:48, Peter Krefting wrote:
> Hi!
>
> After upgrading Git to 2.6.3 (from 2.5.0), gitk refuses to start when
> trying to load the Swedish translation if I pass it a commit range:
The patch can be found here:
http://article.gmane.org/gmane.comp.version-control.git/278863
Cheers,
Beat
s to unbreak our international
users.
Signed-off-by: Beat Bolli
Cc: Paul Mackerras
---
gitk-git/gitk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 2028b55..fcc606e 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -12452,8 +12
Git core has had automatic garbage collection for a long time.
Git-gui does not need a similar heuristic.
Signed-off-by: Beat Bolli
Cc: Pat Thoyts
---
git-gui.sh | 3 ---
lib/database.tcl | 26 --
2 files changed, 29 deletions(-)
diff --git a/git-gui.sh b/git
Commit d835dbb9 ("gitk: Add a "Copy commit summary" command",
2015-08-13) in the upstream gitk repo added a new context menu entry.
Therefore, the line numbers of the entries below the new one need to be
adjusted when their text or state is changed.
Signed-off-by: Beat Bolli
On 13.08.15 09:37, Paul Mackerras wrote:
> On Sat, Jul 18, 2015 at 01:15:39PM +0200, Beat Bolli wrote:
>> When referring to earlier commits in commit messages or other text, one
>> of the established formats is
>>
>> ("", )
>>
>> Add a "
274161
Signed-off-by: Beat Bolli
Cc: Paul Mackerras
---
Paul, feel free to squash this commit into my previous one.
Signed-off-by: Beat Bolli
---
gitk-git/gitk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d05169a..bc0e586 100755
---
On 21.07.15 12:28, Paul Mackerras wrote:
> On Tue, Jul 21, 2015 at 12:19:23PM +0200, Beat Bolli wrote:
>> Guys,
>>
>> can I get a Yea or Nay for this patch?
>>
>> Does it go in via Paul's gitk repo or directly through Junio?
>
> I'll put it in.
Guys,
can I get a Yea or Nay for this patch?
Does it go in via Paul's gitk repo or directly through Junio?
Thanks,
Beat
On 18.07.15 13:15, Beat Bolli wrote:
> When referring to earlier commits in commit messages or other text, one
> of the established formats is
>
>
On 18.07.15 14:23, Paul Mackerras wrote:
> On Fri, Jul 17, 2015 at 08:30:24AM -0700, Junio C Hamano wrote:
>> Paul Mackerras writes:
>>
>>> We have an item in the preferences menu to control the SHA1 length
>>> that is automatically selected when going to a new commit. It's
>>> stored in the vari
users to create well-formatted commit references.
The is produced with the %h format specifier to make it
unique. Its length can be controlled with the gitk preference
"Auto-select SHA1 (length)", or, if this preference is set to its
default value (40), with the Git config setting core.abbrev.
On 17.07.15 19:28, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>>> Signed-off-by: Beat Bolli
>>> Reviewed-by: Eric Sunshine
>>> Reviewed-by: Johannes Sixt
>>
>> You should drop these Reviewed-by: footers, as they imply that the
>> code wa
On 2015-07-17 10:50, li...@haller-berlin.de wrote:
Junio C Hamano wrote:
Beat Bolli writes:
> When referring to earlier commits in commit messages or other
text, one
> of the established formats is
>
> ("", )
> ...
> +proc copysummary {} {
> +
users to create well-formatted commit references.
The is produced with the %h format specifier to make it
unique. Its minimum length can be controlled with the config setting
core.abbrev.
Signed-off-by: Beat Bolli
Reviewed-by: Eric Sunshine
Reviewed-by: Johannes Sixt
Cc: Paul Mackerras
---
Chan
users to create well-formatted commit references.
Signed-off-by: Beat Bolli
Cc: Paul Mackerras
---
gitk-git/gitk | 14 ++
1 file changed, 14 insertions(+)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 9a2daf3..72a2756 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2617,6 +2617,
On 22.12.14 19:02, Junio C Hamano wrote:
> dev+...@drbeat.li writes:
>
>> From: Beat Bolli
>>
>> The value is the same on both uniset invocations, so "Don't Repeat
>> Yourself" applies.
>>
>> Since we're in a subshell already, the
On 19.12.14 16:22, Jeff King wrote:
> On Fri, Dec 19, 2014 at 03:39:30PM +0100, dev+...@drbeat.li wrote:
>
>> By using printf instead of the echo/uniset sequence, the final structure
>> of the generated file becomes obvious.
>
> This whole series looks pretty sane to me, and the result is easier
On 19.12.14 15:39, dev+...@drbeat.li wrote:
> From: Beat Bolli
Sorry, it looks like git send-email borked these messages. This line
should be part of the mail headers.
Regards,
Beat Bolli
--
https://drbeat.li
pgp: 0x506A903A; 49D5 794A EA77 F907 764F D89E 304B 93CF 506A 903A
On 29.08.14 21:04, Junio C Hamano wrote:
> I've queued with this fix squashed in.
Oops, I just sent v3 with your latest fixes as well. Please ignore it.
Thanks,
Beat
--
mail: echo '' | tr -d '[A-S]'
pgp: 0x506A903A; 49D5 794A EA77 F907 764F D89E 304B 93CF 506A 903A
gsm: 4.7.7.6.0.7.7.9.7.1.4.e
On 29.08.14 20:59, Junio C Hamano wrote:
>> +# ISO strict date format
>> +test_expect_success 'ISO and ISO-strict date formats display the same
>> values' '
>> +git log --format=%ai%n%ci | sed -e "s/ /T/; s/ //; s/..\$/:&/"
>> >expected &&
>> +git log --format=%aI%n%cI >actual &&
>> +
I') and the '--date=iso-strict' or '--date=iso8601-strict' date format
names.
See http://thread.gmane.org/gmane.comp.version-control.git/255879 and
http://thread.gmane.org/gmane.comp.version-control.git/52414/focus=52585
for discussion.
Signed-off-by: Beat Bolli
---
v3:
#x27;) and the '--date=iso-strict' or
'--date=iso8601-strict' date format names.
See http://thread.gmane.org/gmane.comp.version-control.git/255879 and
http://thread.gmane.org/gmane.comp.version-control.git/52414/focus=52585
for discussion.
Signed-off-by: Beat Bolli
---
v2:
It uses the '%aI' and '%cI' format specifiers or the '--date=iso-strict'
date format name.
See http://article.gmane.org/gmane.comp.version-control.git/255879 for
discussion.
Signed-off-by: Beat Bolli
---
Documentation/git-rev-list.txt | 2 +-
Documenta
No po update needed, as this string is untranslated.
Signed-off-by: Beat Bolli
---
git-gui/lib/commit.tcl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 0d81432..78c5eeb 100644
--- a/git-gui/lib/commit.tcl
+++ b/git
Adding __git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the "|CHERRY-PICKING" flag.
Delete the file causing this flag when cleaning up.
Signed-off-by: Beat Bolli
-
101 - 137 of 137 matches
Mail list logo
