Since cd67e4d (Teach 'git pull' about --rebase, 2007-11-28),
fetch+rebase could be set by default by defining the config variable
branch.name.rebase. This setting can be overriden on the command line
by --rebase and --no-rebase.
Since 6b37dff (pull: introduce a pull.rebase option to enable
Hi Paul,
On 2015-05-18 15:54, Paul Tan wrote:
diff --git a/git-pull.sh b/git-pull.sh
index 633c385..67f825c 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,13 +4,53 @@
#
# Fetch one or more remote refs and merge it/them into the current HEAD.
-USAGE='[-n | --no-stat]
This series directly depends on the changes made in jc/merge and
pt/pull-tests. The commit messages assume that the behavioral changes
proposed in pt/pull-log-n, pt/pull-tags-error-diag, pt/pull-ff-vs-merge-ff,
and [1] have been introduced.
git-pull is a commonly executed command to check for new
Since b10ac50 (Fix pulling into the same branch., 2005-08-25), git-pull,
upon detecting that git-fetch updated the current head, will
fast-forward the working tree to the updated head commit.
Implement tests to ensure that the fast-forward occurs in such a case,
as well as to ensure that the
Since b814da8 (pull: add pull.ff configuration, 2014-01-15) git-pull
supported setting --(no-)ff via the pull.ff configuration value.
However, as it only matches the string values of true and false, it
does not support other boolean aliases such as on, off, 1, 0.
This is inconsistent with the
Since efb779f (merge, pull: add '--(no-)log' command line option,
2008-04-06) git-pull supported the (--no-)log switch and would pass it
to git-merge.
96e9420 (merge: Make '--log' an integer option for number of shortlog
entries, 2010-09-08) implemented support for the --log=n switch, which
would
Junio C Hamano gits...@pobox.com writes:
Stefan Beller sbel...@google.com writes:
When looking through existing tests to point out good style I came across
t1020, which has a test commented out and the comment wasn't helping me
either of what the test should accomplish in the future. The
Jeff King p...@peff.net writes:
What do you want to do with the verbose calls I have been sprinkling
through the test suite (and the function itself)? Leave them or remove
them? A grep for verbose (with the trailing space) shows some
examples.
That was one of the things I wanted to do next,
On 18/05/15 18:59, FusionX86 wrote:
Hello,
Anyone know of a way to 'git p4 clone' and exclude files by type or
name? For example, I want to clone a depot, but not pull down any .exe
files. Haven't been able to find an answer in docs or other searches.
I think you can use a client spec which
On Mon, May 18, 2015 at 4:23 PM, Antoine Delaite
antoine.dela...@ensimag.grenoble-inp.fr wrote:
Hello Git community,
We are a team of five students from the ENSIMAG (a french school of
engineering and computer science) who are going to contribute to git during a
month at least and after if
Sébastien Guimmara sebastien.guimm...@gmail.com writes:
'git help' shows common commands in alphabetical order:
The most commonly used git commands are:
addAdd file contents to the index
bisect Find by binary search the change that introduced a bug
branch List,
On 05/18/2015 04:28 PM, John McIntyre wrote:
2015-05-18 11:26 GMT+01:00 Heiko Voigt hvo...@hvoigt.net:
If you want a simple tool using ssh-keys have a look at gitolite[1].
It quite simple to setup and with it you can specify all kinds of access
rights.
That's adding a separate level of
12 matches
Mail list logo