Re: What's cooking in git.git (Sep 2015, #03; Mon, 14)

[Junio C Hamano]

"Philip Oakley"  writes:

> Oops..
> ...
>> Shall I just rework/resend the V2 patch-up ($gmane/277829) that also
>> links to 'merge's' usage as a fresh patch (would be tonight UK)?
>
> I now see that the full V2 patch is already there at 4934a96.

OK.  I was wondering what I missed.  4934a96^2 is a copy of your v2.

> I'd mistakenly just compared your note to the slightly fuller V2 commit
> message and in the morning rush hadn't had time to check.
>
> Sorry for the noise.

Thanks for being careful.
--
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  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Sep 2015, #03; Mon, 14)

[Philip Oakley]

From: "Junio C Hamano" 
Sent: Monday, September 14, 2015 11:43 PM

--



[New Topics]



* po/doc-branch-desc (2015-09-14) 1 commit
 (merged to 'next' on 2015-09-14 at 4934a96)
+ doc: show usage of branch description

The branch descriptions that are set with "git 
branch --edit-description"

option were used in many places but they weren't clearly documented.

Will merge to 'master'.


Thanks.
Shall I just rework/resend the V2 patch-up ($gmane/277829) that also 
links to 'merge's' usage as a fresh patch (would be tonight UK)?


--
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  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Sep 2015, #03; Mon, 14)

[Philip Oakley]

Oops..
From: "Philip Oakley" 

[New Topics]



* po/doc-branch-desc (2015-09-14) 1 commit
 (merged to 'next' on 2015-09-14 at 4934a96)
+ doc: show usage of branch description

The branch descriptions that are set with "git
branch --edit-description"
option were used in many places but they weren't clearly documented.

Will merge to 'master'.


Thanks.
Shall I just rework/resend the V2 patch-up ($gmane/277829) that also
links to 'merge's' usage as a fresh patch (would be tonight UK)?


I now see that the full V2 patch is already there at 4934a96.
I'd mistakenly just compared your note to the slightly fuller V2 commit
message and in the morning rush hadn't had time to check.

Sorry for the noise.

Philip

--
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  http://vger.kernel.org/majordomo-info.html

What's cooking in git.git (Sep 2015, #03; Mon, 14)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.

The tip of 'master' is slightly past 2.6-rc2; hopefully l10n team
can work on this without updates before the end of the cycle.

You can find the changes described here in the integration branches
of the repositories listed at

http://git-blame.blogspot.com/p/git-public-repositories.html

--
[Graduated to "master"]

* ah/show-ref-usage-string (2015-08-31) 1 commit
  (merged to 'next' on 2015-09-08 at dc512c8)
 + show-ref: place angle brackets around variables in usage string

 Both "git show-ref -h" and "git show-ref --help" illustrated that the
 "--exclude-existing" option makes the command read list of refs
 from its standard input.  Change only the "show-ref -h" output to
 have a pair of "<>" around the placeholder that designate an input
 file, i.e. "git show-ref --exclude-existing < ".


* gb/apply-comment-typofix (2015-09-09) 1 commit
  (merged to 'next' on 2015-09-09 at 29fb0ff)
 + apply: comment grammar fix


* jk/pack-protocol-doc (2015-09-03) 1 commit
  (merged to 'next' on 2015-09-08 at 98d861d)
 + pack-protocol: clarify LF-handling in PKT-LINE()

 Streamline documentation of the pkt-line protocol.


* js/maint-am-skip-performance-regression (2015-09-09) 1 commit
  (merged to 'next' on 2015-09-14 at b669ea1)
 + am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

 Later versions of scripted "git am" has a performance regression in
 "git am --skip" codepath, which no longer exists in the built-in
 version on the 'master' front.  Fix the regression in the last
 scripted version that appear in 2.5.x maintenance track and older.

 Will merge to 'maint' and older.


* mp/t7060-diff-index-test (2015-09-02) 1 commit
  (merged to 'next' on 2015-09-08 at 80ff284)
 + t7060: actually test "git diff-index --cached -M"

 Fix an old test that was doing the same thing as another one.


* rt/help-strings-fix (2015-09-11) 2 commits
  (merged to 'next' on 2015-09-14 at 875908c)
 + tag, update-ref: improve description of option "create-reflog"
 + pull: don't mark values for option "rebase" for translation
 

* sg/help-group (2015-09-10) 1 commit
  (merged to 'next' on 2015-09-14 at cef17e2)
 + Makefile: use SHELL_PATH when running generate-cmdlist.sh

 Last minute regression fix.

--
[New Topics]

* ld/p4-detached-head (2015-09-09) 2 commits
 - git-p4: work with a detached head
 - git-p4: add failing test for submit from detached head

 Will be rerolled.
 ($gmane/277574)


* as/config-doc-markup-fix (2015-09-12) 1 commit
  (merged to 'next' on 2015-09-14 at faa4134)
 + Documentation/config: fix formatting for branch.*.rebase and pull.rebase

 Will merge to 'master'.


* et/win32-poll-timeout (2015-09-14) 1 commit
  (merged to 'next' on 2015-09-14 at 308dff4)
 + poll: honor the timeout on Win32

 Will merge to 'master'.


* jk/graph-format-padding (2015-09-14) 1 commit
 - pretty: pass graph width to pretty formatting for use in '%>|(N)'

 Redefine the way '%>|(N)' padding and the "--graph" option
 interacts.  It has been that the available columns to display the
 log message was measured from the edge of the area the graph ended,
 but with this it becomes the beginning of the entire output.

 I have a suspicion that 50% of the users would appreciate this
 change, and the remainder see this break their expectation.  If
 that is the case, we might need to introduce a similar but
 different alignment operator so that this new behaviour is
 available to those who want to use it, without negatively affecting
 existing uses.


* jk/make-findstring-makeflags-fix (2015-09-10) 1 commit
 - Makefile: fix MAKEFLAGS tests with multiple flags

 Customization to change the behaviour with "make -w" and "make -s"
 in our Makefile was broken when they were used together.

 Will merge to 'next'.


* jk/rebase-no-autostash (2015-09-10) 2 commits
 - Documentation/git-rebase: fix --no-autostash formatting
 - rebase: support --no-autostash

 There was no way to defeat a configured rebase.autostash variable
 from the command line, as "git rebase --no-autostash" was missing.

 Will merge to 'next'.


* jw/make-arflags-customizable (2015-09-10) 1 commit
 - Makefile: allow $(ARFLAGS) specified from the command line

 The Makefile always runs the library archiver with hardcoded "crs"
 options, which was inconvenient for exotic platforms on which
 people wants to use programs with totally different set of command
 line options.

 Will merge to 'next'.


* nd/ignore-then-not-ignore (2015-09-14) 2 commits
 - dir.c: don't exclude whole dir prematurely if neg pattern may match
 - dir.c: make last_exclude_matching_from_list() run til the end

 Allow a later "!/abc/def" to override an earlier "/abc" that
 appears in the same .gitignore file to make it easier to express
 "everything in /abc