$(git notes merge FETCH_HEAD) doesn't work

is not optimal. I don't know why one might want to treat a broken remote side as empty but at least a diagnostic message would be nice. The same happens if I pass an explicit sha1 instead of FETCH_HEAD. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial

feature-request: git notes copy --to ref

it? Then I'd volunteer to test it :-) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: feature-request: git notes copy --to ref

Hello again, On Thu, Feb 20, 2014 at 10:03:34PM +0100, Uwe Kleine-König wrote: I'm playing around with git-notes and want to share some of my notes with my co-workers. We have a central repository for our various topic branches and want to track upstream inclusion in git-notes. So we have

BUG?: git-filter-branch removes mergetags

PGP SIGNATURE- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm I expected the signature to not disappear such that in the example above no change is introduced. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König

[PATCH RFC] log-tree: let format-patch not indent notes

don't indent and skip the header in this case. This also removes the empty line between the end-of-commit marker and the start of the notes. Signed-off-by: Uwe Kleine-König u.kleine-koe...@pengutronix.de --- This commit changes the output of format-patch (applied on this commit) from

Re: [PATCH RFC] log-tree: let format-patch not indent notes

Hello Junio, On Thu, Sep 25, 2014 at 10:24:53AM -0700, Junio C Hamano wrote: Uwe Kleine-König u.kleine-koe...@pengutronix.de writes: Commit logs as shown by git-log are usually indented by four spaces so here it makes sense to do the same for commit notes. However when using format

git log anomalities

don't understand? (I'm using Debian's 1:1.8.3.2-1) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] log: use true parents for diff even when rewriting

. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- 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

feature suggestion: improve rerere

1.8.2~rc2-1 and hope I didn't miss this feature already implemented while looking through v1.8.2..junio/next. -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list

feature suggestion: optimize common parts for checkout --conflict=diff3

+ 29 + 30 ++ theirs Of course this is technically correct, just not maximally helpful. Is this a missing optimisation for the diff3 case or did I miss a detail that makes my expectation wrong? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine

[PATCH] xdiff: implement a zealous diff3

zdiff3 is identical to ordinary diff3, only it allows more aggressive compaction than diff3. This way the displayed base isn't necessary technically correct, but still this mode might help resolving merge conflicts between two near identical additions. Signed-off-by: Uwe Kleine-König u.kleine-koe

Re: feature suggestion: optimize common parts for checkout --conflict=diff3

to the things Jeff said so far. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

[BUG gitk] notes not reloaded on Update/Reload

. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- 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

[BUG gitk] strange scrolling behaviour if history canvas not completely filled

that would appear at the mouse tip if the history were not scrolled down. Best regards Uwe PS: I'm not subscribed, so please Cc: me on replies. -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de

Re: [PATCH 0/7] Add support for Freescale's mc34708 to mc13xxx driver

break bisectibility, and as the rtc patches go in via a different tree (in fact akpm already took them) it doesn't matter much. Best regards and thanks for your feedback Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions

Re: feature suggestion: optimize common parts for checkout --conflict=diff3

. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- 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

[BUG?] git checkout $commit -- somedir doesn't drop files

/a # Is this intended? (I'm using git 1.8.4.rc3 as shipped by Debian (package version 1:1.8.4~rc3-1).) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list

BUG: git request-pull broken for plain branches

-pull.sh fail. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: BUG: git request-pull broken for plain branches

Hello Linus, On Wed, Jun 25, 2014 at 05:05:51AM -0700, Linus Torvalds wrote: On Wed, Jun 25, 2014 at 2:55 AM, Uwe Kleine-König u.kleine-koe...@pengutronix.de wrote: $ git rev-parse HEAD 9e065e4a5a58308f1a0da4bb80b830929dfa90b3 $ git ls-remote origin | grep

Re: BUG: git request-pull broken for plain branches

Hi Junio, On Wed, Jun 25, 2014 at 01:41:23PM -0700, Junio C Hamano wrote: Uwe Kleine-König u.kleine-koe...@pengutronix.de writes: On Wed, Jun 25, 2014 at 05:05:51AM -0700, Linus Torvalds wrote: On Wed, Jun 25, 2014 at 2:55 AM, Uwe Kleine-König u.kleine-koe...@pengutronix.de wrote

git filter-branch and merging of signed tags

+0200 committer Arnd Bergmann <a...@arndb.de> 1444139956 +0200 mergetag object f719a0d6a8541b383c506aaa4b4fa6b4109669f4 type commit tag efm32-for-4.4-rc1 tagger Uwe Kleine-König <u...@kleine-koenig.org> 1443549594 +0200 efm32 cl

Re: git filter-branch and merging of signed tags

Hello Michael, On Mon, Nov 02, 2015 at 05:21:03PM +0100, Michael J Gruber wrote: > Uwe Kleine-König venit, vidit, dixit 02.11.2015 09:04: > > ~/gsrc/linux$ git version > > git version 2.6.1 > > Does your git include > a5a4b3f (filter-branch: remove multi-li

please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

inal mail, just ask per PM. Best regards Uwe On Wed, Oct 07, 2015 at 03:41:19AM -0700, Tony Lindgren wrote: > * Uwe Kleine-König <u.kleine-koe...@pengutronix.de> [151007 00:57]: > > On Wed, Oct 07, 2015 at 10:45:50AM +0300, Roger Quadros wrote: > > > > > > H

Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Hello Junio, On Thu, Oct 08, 2015 at 01:04:01PM -0700, Junio C Hamano wrote: > Uwe Kleine-König <u.kleine-koe...@pengutronix.de> writes: > > >> Does this have anything to do with scissors, though? If you remove > >> everything before "8< ---&quo

Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Hello Junio, On Thu, Oct 08, 2015 at 12:28:46PM -0700, Junio C Hamano wrote: > Uwe Kleine-König <u.kleine-koe...@pengutronix.de> writes: > > > Hello, > > > > when applying the mail below (without the '> ' prefix) using git am > > --scissors the re

[PATCH] howto/using-merge-subtree: mention --allow-unrelated-histories

Without passing --allow-unrelated-histories the command sequence fails as intended since commit e379fdf34fee ("merge: refuse to create too cool a merge by default"). To setup a subtree merging unrelated histories is normal, so add the option to the howto document. Signed-off-by: Uwe Kl