Re: config for `format-patch --notes`?

Thanks for the reply. I did not knew that branch descriptions automatically make it in the cover letter. Learned something new! Unfortunately this would still mean I have to manually add the branch name to the branch description. I will try to create a patch for adding a config option for the

Missing option for format-patch?

Hi, I use `git format-patch master..myBranch` quite a bit to send patches to other developers. I also add notes to the commits so that I remember which patches were emailed to whom. `git log` has an option to automatically include the notes in the output. However, I can't find such an option

config for `format-patch --notes`?

Hi, I use `git format-patch master..myBranch` quite a bit to send patches to other developers. I also add notes to the commits so that I e.g. remember which patches were emailed to whom. `git log` has an option to automatically include the notes in the output. However, I can't find such an

indent-heuristic, compaction-heuristic combination

Hi, I started using compaction-heuristic with 2.9, and then also (or so I thought) enabled indent-heuristic with 2.11. Only after reading a comment in "Git rev news" I realized that these 2 options are mutually exclusive. I then checked the Git source code and saw that Git first checks the new

Re: Rebasing cascading topic trees

og --oneline --graph --all On Wed, Nov 16, 2016 at 5:45 PM, Jeff King <p...@peff.net> wrote: > On Wed, Nov 16, 2016 at 04:12:20PM -0800, Norbert Kiesel wrote: > >> Yes, `git rebase --onto topic1 topic1@{1} topic2` is the answer! > > See also the `--fork-point` option, which (I

Re: Rebasing cascading topic trees

Yes, `git rebase --onto topic1 topic1@{1} topic2` is the answer! Thanks so much, learned something new today. On Wed, Nov 16, 2016 at 3:44 PM, Junio C Hamano <gits...@pobox.com> wrote: > Norbert Kiesel <nkie...@gmail.com> writes: > >> I currently have a situation with

Rebasing cascading topic trees

I currently have a situation with cascading topic branches that I need to rebase regularly. In the picture below, I want to rebase the tree starting with `E` to be rebased onto master (my actually cascade is 4 branches deep). A--B--C--D (master) \ E--F (topic1) \ G--H

[Bug?] git notes are not copied during rebase

' % date % git add b % git commit -m c2 [mybranch 5ef9954] c2 1 file changed, 1 insertion(+) create mode 100644 b % git notes add -m note1 % git log commit 5ef9954 (HEAD -> mybranch) Author: Norbert Kiesel <nkie...@metricstream.com> Date: Mon Nov 14 15:48:00 2016 -0800 c2 Notes:

Re: [PATCH 0/3] fix local_tzoffset with far-in-future dates

There are more strange things happening with dates. One example is that `git commit --date=@4102444799` produces a commit with the correct author date "Thu Dec 31 15:59:59 2099 -0800" (for my local timezone which is Americas/Los_Angeles), while `git commit --date=@4102444800` produces a commit

Re: unable to pull from remote if commit date is in the future

On Mon, Jun 20, 2016 at 12:39 PM, Jeff King wrote: > git cat-file commit 23c07cc | egrep '^author|committer' author Sean D'Epagnier 5758122296 -40643156 committer Sean D'Epagnier 5758122296 -40643156 date --date='@5758122296'

Re: unable to pull from remote if commit date is in the future

is running Debian unstable 64bit. Is git using the time rendering methods from the C library (glibc 2.22-12)? On Mon, Jun 20, 2016 at 11:46 AM, Stefan Beller <sbel...@google.com> wrote: > On Mon, Jun 20, 2016 at 11:41 AM, Norbert Kiesel <nkie...@gmail.com> wrote: >> Hi, >&

unable to pull from remote if commit date is in the future

Hi, I'm following an upstream repo on github. Today morning I saw a new commit there, but a `git pull` in my clone did not fetch it and instead said "Already up-to-date.". On closer inspection, github reports commit time as 2152-06-19. The same project has some other commits with commit time in