|
From: | Eli Zaretskii |
Subject: | Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, |
Date: | Wed, 08 Apr 2015 21:29:50 +0300 |
> Date: Wed, 08 Apr 2015 14:21:42 -0400 > From: Richard Stallman <address@hidden> > Cc: address@hidden > > Maybe we could develop a version of git pull that merges like CVS, > rather than failing when remote changes are in the same file as a > local change. git-pull is a shell script, you will find it in libexec/git-core/ directory. Someone who knows enough about low-level Git commands can write a modified script to do whatever they like.
[Prev in Thread] | Current Thread | [Next in Thread] |