Re: [RFC/PATCH 2/2] WIP xdiff: markup duplicates differently

2016-09-03 Thread Stefan Beller
On Sat, Sep 3, 2016 at 5:25 AM, Jakub Narębski wrote: > W dniu 03.09.2016 o 05:31, Stefan Beller pisze: > >> When moving code (e.g. a function is moved to another part of the file or >> to a different file), the review process is different than reviewing new >> code. When

Re: [RFC/PATCH 0/2] Color moved code differently

2016-09-03 Thread Stefan Beller
On Sat, Sep 3, 2016 at 12:00 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> A line is colored differently if that line and the surroundign 2 lines >> appear as-is in the opposite part of the diff. >> >> Example: >> http://i.imgur.com/ay84q0q.png >>

I want this app removed

2016-09-03 Thread 3344688792
I want this app removed

Re: [PATCH] stash: allow ref of a stash by index

2016-09-03 Thread Jeff King
On Sat, Sep 03, 2016 at 07:21:18PM -0400, Aaron M Watson wrote: > Allows stashes to be referenced by index only. Instead of referencing > "stash@{n}" explicitly, it can simply be referenced as "n". This says "what" but not "why". I assume it is "because the former is more annoying to type". Are

[PATCH] stash: allow ref of a stash by index

2016-09-03 Thread Aaron M Watson
Allows stashes to be referenced by index only. Instead of referencing "stash@{n}" explicitly, it can simply be referenced as "n". Signed-off-by: Aaron M Watson ---  Documentation/git-stash.txt | 11 ---  git-stash.sh| 10 +-  t/t3907-stash-index.sh  

Re: Fixup of a fixup not working right

2016-09-03 Thread Philip Oakley
Hi Robert, From: "Robert Dailey" On Fri, Sep 2, 2016 at 9:22 PM, Junio C Hamano wrote: Perhaps a change like this to "rebase -i": - The search for "original" when handling "pick fixup! original", when it does not find "original", could turn it

Re: Literate programming with git

2016-09-03 Thread Ben North
Hi Stefan, Thanks for the remarks. >> https://github.com/bennorth/git-dendrify > > [...] You get an easy top-level overview what > the community is interested in via e.g.: > > git log --first-parent --oneline > > That would be equivalent to showing only > * Add printing facility > >

!!!

2016-09-03 Thread admoss1980
http://www.baidu.com/link?url=DsqnrRyBjH64xj2HvdqZKR4I8iRgR7o9Is6IOc8EiYC#680=ivevjp&4049==97698091

Re: [PATCH 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper

2016-09-03 Thread Josh Triplett
On Fri, Sep 02, 2016 at 06:23:42PM +0200, Johannes Schindelin wrote: > Let's reimplement this with linear complexity (using a hash map to > match the commits' subject lines) for the common case; Sadly, the > fixup/squash feature's design neglected performance considerations, > allowing arbitrary

[PATCH] introduce hex2chr() for converting two hexadecimal digits to a character

2016-09-03 Thread René Scharfe
Add and use a helper function that decodes the char value of two hexadecimal digits. It returns a negative number on error, avoids running over the end of the given string and doesn't shift negative values. Signed-off-by: Rene Scharfe --- cache.h | 10 ++ hex.c

[PATCH] compat: move strdup(3) replacement to its own file

2016-09-03 Thread René Scharfe
Move our implementation of strdup(3) out of compat/nedmalloc/ and allow it to be used independently from USE_NED_ALLOCATOR. This reduces the difference of our copy of nedmalloc from the original, making it easier to update, and allows for easier testing and reusing of our version of strdup().

[PATCH 5/6] git-gui: Update Japanese translation

2016-09-03 Thread Satoshi Yasushima
Signed-off-by: Satoshi Yasushima --- po/ja.po | 77 +--- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/po/ja.po b/po/ja.po index 23974cc..deaf8e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -102,6

[PATCH 6/6] git-gui: Update Japanese information

2016-09-03 Thread Satoshi Yasushima
Signed-off-by: Satoshi Yasushima --- po/ja.po | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index deaf8e3..208651c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,15 +1,17 @@ # Translation of git-gui to Japanese # Copyright (C)

[PATCH 4/6] git-gui: Add Japanese language code

2016-09-03 Thread Satoshi Yasushima
Signed-off-by: Satoshi Yasushima --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index b140e8b..23974cc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2010-02-02 19:03+0900\n"

[PATCH 2/6] git-gui: The term unified for blame in Japanese

2016-09-03 Thread Satoshi Yasushima
Signed-off-by: Satoshi Yasushima --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8a2c16f..b692b5c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -598,7 +598,7 @@ msgstr "文脈を見せる" #: lib/blame.tcl:291 msgid "Blame

[PATCH 1/6] git-gui: The term unified for remote in Japanese

2016-09-03 Thread Satoshi Yasushima
Signed-off-by: Satoshi Yasushima --- po/ja.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9aff249..8a2c16f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -765,7 +765,8 @@ msgstr "トラッキング・ブランチを選択して下さい。" #:

Re: Fixup of a fixup not working right

2016-09-03 Thread Robert Dailey
On Fri, Sep 2, 2016 at 9:22 PM, Junio C Hamano wrote: > Perhaps a change like this to "rebase -i": > > - The search for "original" when handling "pick fixup! original", >when it does not find "original", could turn it into "reword >fixup! original" without changing its

[ANNOUNCE] Git for Windows 2.10.0

2016-09-03 Thread Johannes Schindelin
Dear Git users, It is my pleasure to announce that Git for Windows 2.10.0 is available. This time, I even blogged about it, primarily because I am so excited about the speed improvements of rebase -i: https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/03/whats-new-in-git-for-windows-2-10/

Re: [RFC/PATCH 2/2] WIP xdiff: markup duplicates differently

2016-09-03 Thread Jakub Narębski
W dniu 03.09.2016 o 05:31, Stefan Beller pisze: > When moving code (e.g. a function is moved to another part of the file or > to a different file), the review process is different than reviewing new > code. When reviewing moved code we are only interested in the diff as > where there are

Re: A note from the maintainer

2016-09-03 Thread Jakub Narębski
W dniu 03.09.2016 o 04:17, Junio C Hamano pisze: > Please remember to always state > > - what you wanted to achieve; > > - what you did (the version of git and the command sequence to reproduce >the behavior); I wonder if it be worth adding to not use aliases (or expand them). I have

Re: [PATCH 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper

2016-09-03 Thread Johannes Schindelin
Hi Dennis, On Fri, 2 Sep 2016, Dennis Kaarsemaker wrote: > On vr, 2016-09-02 at 18:23 +0200, Johannes Schindelin wrote: > > This is crucial to improve performance on Windows, as the speed is now > > mostly dominated by the SHA-1 transformation (because it spawns a new > > rev-parse process for

Re: [RFC/PATCH 0/2] Color moved code differently

2016-09-03 Thread Junio C Hamano
Stefan Beller writes: > A line is colored differently if that line and the surroundign 2 lines > appear as-is in the opposite part of the diff. > > Example: > http://i.imgur.com/ay84q0q.png > > Or apply these patches and > git show

Re: [PATCH 01/34] sequencer: support a new action: 'interactive rebase'

2016-09-03 Thread Johannes Schindelin
Hi Kevin, On Fri, 2 Sep 2016, Kevin Daudt wrote: > On Wed, Aug 31, 2016 at 10:54:02AM +0200, Johannes Schindelin wrote: > > @@ -43,16 +51,20 @@ static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, > > "rebase-merge/gpg_sign_opt") > > /* We will introduce the 'interactive rebase' mode later */ > >