user/sven/git.git/git-pull.sh, branch v1.4.4.4

git-pull: allow pulling into an empty repository

2006-11-17T07:45:48Z

We used to complain that we cannot merge anything we fetched with a local branch that does not exist yet. Just treat the case as a natural extension of fast forwarding and make the local branch'es tip point at the same commit we just fetched. After all an empty repository without an initial commit is an ancestor of any commit. [jc: I added a trivial test. We've become sloppy but we should stick to the discipline of covering new behaviour with new tests. ] Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

git-pull: we say commit X, not X commit.

2006-10-11T06:00:29Z

Signed-off-by: Junio C Hamano

Log ref changes made by git-merge and git-pull.

2006-07-11T21:16:53Z

When git-merge updates HEAD as a result of a merge record what happened during the merge into the reflog associated with HEAD (if any). The log reports who caused the update (git-merge or git-pull, by invoking git-merge), what the remote ref names were and the type of merge process used. The merge information can be useful when reviewing a reflog for a branch such as `master` where fast forward and trivial in index merges might be common as the user tracks an upstream. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Log ref changes made by git-fetch and git-pull.

2006-07-11T04:21:27Z

When git-fetch updates a reference record in the associated reflog what type of update took place and who caused it (git-fetch or git-pull, by invoking git-fetch). Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Fix expr usage for FreeBSD

2006-06-27T17:56:05Z

Some implementations of "expr" (e.g. FreeBSD's) fail, if an argument starts with a dash. Signed-off-by: Dennis Stosberg Signed-off-by: Junio C Hamano

git-merge --squash

2006-06-24T08:11:19Z

Some people tend to do many little commits on a topic branch, recording all the trials and errors, and when the topic is reasonably cooked well, would want to record the net effect of the series as one commit on top of the mainline, removing the cruft from the history. The topic is then abandoned or forked off again from that point at the mainline. The barebone porcelainish that comes with core git tools does not officially support such operation, but you can fake it by using "git pull --no-merge" when such a topic branch is not a strict superset of the mainline, like this: git checkout mainline git pull --no-commit . that-topic-branch : fix conflicts if any rm -f .git/MERGE_HEAD git commit -a -m 'consolidated commit log message' git branch -f that-topic-branch ;# now fully merged This however does not work when the topic branch is a fast forward of the mainline, because normal "git pull" will never create a merge commit in such a case, and there is nothing special --no-commit could do to begin with. This patch introduces a new option, --squash, to support such a workflow officially in both fast-forward case and true merge case. The user-level operation would be the same in both cases: git checkout mainline git pull --squash . that-topic-branch : fix conflicts if any -- naturally, there would be : no conflict if fast forward. git commit -a -m 'consolidated commit log message' git branch -f that-topic-branch ;# now fully merged When the current branch is already up-to-date with respect to the other branch, there truly is nothing to do, so the new option does not have any effect. This was brought up in #git IRC channel recently. Signed-off-by: Junio C Hamano

git-pull: abort when fmt-merge-msg fails.

2006-06-24T08:10:27Z

Signed-off-by: Junio C Hamano

git-pull: reword "impossible to fast-forward" message.

2006-03-22T09:57:11Z

Signed-off-by: Junio C Hamano

git-pull: further safety while on tracking branch.

2006-03-22T09:09:43Z

Running 'git pull' while on the tracking branch has a built-in safety valve to fast-forward the index and working tree to match the branch head, but it errs on the safe side too cautiously. Signed-off-by: Junio C Hamano

git-pull: run repo-config with dash form.

2006-03-18T10:07:59Z

... as discussed on the list for consistency. Signed-off-by: Junio C Hamano