mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* What's cooking (preview)
@ 2016-08-11  0:11 Junio C Hamano
  0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2016-08-11  0:11 UTC (permalink / raw)
  To: git

Just the highlights for today, as we had one on just a few days ago.
I also plan to tag 2.9.3 out of the tonight's tip of 'maint'.


[Graduated to "master"]

* cc/mailmap-tuxfamily (2016-08-08) 1 commit
  (merged to 'next' on 2016-08-10 at 5905fbf)
 + .mailmap: use Christian Couder's Tuxfamily address

* jk/completion-diff-submodule (2016-08-09) 1 commit
  (merged to 'next' on 2016-08-10 at 146ca11)
 + completion: add completion for --submodule=* diff option

* jk/push-force-with-lease-creation (2016-08-04) 4 commits
  (merged to 'next' on 2016-08-04 at e42ce85)
 + t5533: make it pass on case-sensitive filesystems
  (merged to 'next' on 2016-08-03 at 475c080)
 + push: allow pushing new branches with --force-with-lease
 + push: add shorthand for --force-with-lease branch creation
 + Documentation/git-push: fix placeholder formatting

 "git push --force-with-lease" already had enough logic to allow
 ensuring that such a push results in creation of a ref (i.e. the
 receiving end did not have another push from sideways that would be
 discarded by our force-pushing), but didn't expose this possibility
 to the users.  It does so now.

* jk/reset-ident-time-per-commit (2016-08-01) 1 commit
  (merged to 'next' on 2016-08-03 at 76d569c)
 + am: reset cached ident date for each patch

 Not-so-recent rewrite of "git am" that started making internal
 calls into the commit machinery had an unintended regression, in
 that no matter how many seconds it took to apply many patches, the
 resulting committer timestamp for the resulting commits were all
 the same.

* js/am-3-merge-recursive-direct (2016-08-01) 16 commits
  (merged to 'next' on 2016-08-05 at dc1c9bb)
 + merge-recursive: flush output buffer even when erroring out
 + merge_trees(): ensure that the callers release output buffer
 + merge-recursive: offer an option to retain the output in 'obuf'
 + merge-recursive: write the commit title in one go
 + merge-recursive: flush output buffer before printing error messages
 + am -3: use merge_recursive() directly again
 + merge-recursive: switch to returning errors instead of dying
 + merge-recursive: handle return values indicating errors
 + merge-recursive: allow write_tree_from_memory() to error out
 + merge-recursive: avoid returning a wholesale struct
 + merge_recursive: abort properly upon errors
 + prepare the builtins for a libified merge_recursive()
 + merge-recursive: clarify code in was_tracked()
 + die(_("BUG")): avoid translating bug messages
 + die("bug"): report bugs consistently
 + t5520: verify that `pull --rebase` shows the helpful advice when failing

 "git am -3" calls "git merge-recursive" when it needs to fall back
 to a three-way merge; this call has been turned into an internal
 subroutine call instead of spawning a separate subprocess.

* js/commit-slab-decl-fix (2016-08-09) 2 commits
  (merged to 'next' on 2016-08-10 at 6675402)
 + commit-slab.h: avoid duplicated global static variables
 + config.c: avoid duplicated global static variables

* jt/format-patch-from-config (2016-08-01) 1 commit
  (merged to 'next' on 2016-08-05 at 897e986)
 + format-patch: format.from gives the default for --from

 "git format-patch" learned format.from configuration variable to
 specify the default settings for its "--from" option.

* sb/submodule-update-dot-branch (2016-08-10) 8 commits
  (merged to 'next' on 2016-08-10 at 40ba945)
 + t7406: fix breakage on OSX
  (merged to 'next' on 2016-08-04 at 47bff41)
 + submodule update: allow '.' for branch value
 + submodule--helper: add remote-branch helper
 + submodule-config: keep configured branch around
 + submodule--helper: fix usage string for relative-path
 + submodule update: narrow scope of local variable
 + submodule update: respect depth in subsequent fetches
 + t7406: future proof tests with hard coded depth

 A few updates to "git submodule update".

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-08-11  0:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-11  0:11 What's cooking (preview) Junio C Hamano

Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).