If I disable mnemonic prefix,
$ git config --global diff.noprefix true
and do a round-trip of format-patch and apply,
$ git format-patch -1 @
$ git apply
git apply fails with,
error: git diff header lacks filename information when removing 1
leading pathname component (line 16)
Without 'diff
I think 'git merge --continue' should be advertised more that 'git
commit' as typically one is familiar with 'git rebase --continue' and
'git cherry-pick --continue'. I for a long time did not know I could
also use 'git commit' to continue a merge but that's just me. Now,
'git commit' is easier to
While merging if I do certain actions then the merge commit is made
with the merge message but as a normal (non-merge) commit.
Repro steps:
- Set GIT_MERGE_AUTOEDIT=yes (set other than "no") in .bashrc
- Make a merge commit with no conflicts.
(external text editor shows the generated merge messa
le alias it as --ns.
$ git log --ns
Thanks,
hippy
Git has aliases for git commands. Is there a (an inbuilt) way to alias
options? If not, what is the reason?
Thanks,
hippy
On Mon, Feb 13, 2017 at 1:27 PM, Jeff King wrote:
> On Mon, Feb 13, 2017 at 01:18:40PM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > I think the problem is specifically related to the "terminator" versus
>> > "separator" semantics. Try:
>> >
>> > git log --graph --name-status --pr
On Mon, Feb 13, 2017 at 11:25 AM, Junio C Hamano wrote:
> hIpPy writes:
>
>> The `git log` command with `graph` and pretty format works correctly
>> as expected.
>>
>> $ git log --graph --pretty=format:'%h' -2
>> * 714a14e
>> * 87dce5f
>&g
The `git log` command with `graph` and pretty format works correctly
as expected.
$ git log --graph --pretty=format:'%h' -2
* 714a14e
* 87dce5f
However, with `--name-status` option added, there is a pipe
incorrectly placed after the commit hash (example below).
$ git log --graph --pretty=format
8 matches
Mail list logo
