https://github.com/git/git
Revision c85c79279df2c8a583d95449d1029baba41f8660 authored by Johannes Schindelin on 26 January 2008, 18:04:37 UTC, committed by Junio C Hamano on 27 January 2008, 02:24:24 UTC
When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e509db9
Tip revision: c85c79279df2c8a583d95449d1029baba41f8660 authored by Johannes Schindelin on 26 January 2008, 18:04:37 UTC
pull --rebase: be cleverer with rebased upstream branches
pull --rebase: be cleverer with rebased upstream branches
Tip revision: c85c792
| File | Mode | Size |
|---|---|---|
| Documentation | ||
| arm | ||
| compat | ||
| contrib | ||
| git-gui | ||
| gitk-git | ||
| gitweb | ||
| mozilla-sha1 | ||
| perl | ||
| ppc | ||
| t | ||
| templates | ||
| xdiff | ||
| .gitignore | -rw-r--r-- | 2.2 KB |
| .mailmap | -rw-r--r-- | 2.0 KB |
| COPYING | -rw-r--r-- | 18.3 KB |
| GIT-VERSION-GEN | -rwxr-xr-x | 761 bytes |
| INSTALL | -rw-r--r-- | 4.8 KB |
| Makefile | -rw-r--r-- | 33.7 KB |
| README | -rw-r--r-- | 2.1 KB |
| RelNotes | l--------- | 32 bytes |
| alloc.c | -rw-r--r-- | 1.7 KB |
| archive-tar.c | -rw-r--r-- | 7.5 KB |
| archive-zip.c | -rw-r--r-- | 9.0 KB |
| archive.c | -rw-r--r-- | 2.0 KB |
| archive.h | -rw-r--r-- | 1.3 KB |
| attr.c | -rw-r--r-- | 14.6 KB |
| attr.h | -rw-r--r-- | 816 bytes |
| base85.c | -rw-r--r-- | 2.9 KB |
| blob.c | -rw-r--r-- | 1.1 KB |
| blob.h | -rw-r--r-- | 311 bytes |
| builtin-add.c | -rw-r--r-- | 6.3 KB |
| builtin-annotate.c | -rw-r--r-- | 446 bytes |
| builtin-apply.c | -rw-r--r-- | 70.9 KB |
| builtin-archive.c | -rw-r--r-- | 5.7 KB |
| builtin-blame.c | -rw-r--r-- | 61.4 KB |
| builtin-branch.c | -rw-r--r-- | 15.9 KB |
| builtin-bundle.c | -rw-r--r-- | 1.7 KB |
| builtin-cat-file.c | -rw-r--r-- | 3.4 KB |
| builtin-check-attr.c | -rw-r--r-- | 1.4 KB |
| builtin-check-ref-format.c | -rw-r--r-- | 282 bytes |
| builtin-checkout-index.c | -rw-r--r-- | 7.5 KB |
| builtin-clean.c | -rw-r--r-- | 4.1 KB |
| builtin-commit-tree.c | -rw-r--r-- | 3.3 KB |
| builtin-commit.c | -rw-r--r-- | 24.8 KB |
| builtin-config.c | -rw-r--r-- | 9.9 KB |
| builtin-count-objects.c | -rw-r--r-- | 2.9 KB |
| builtin-describe.c | -rw-r--r-- | 6.9 KB |
| builtin-diff-files.c | -rw-r--r-- | 937 bytes |
| builtin-diff-index.c | -rw-r--r-- | 1.1 KB |
| builtin-diff-tree.c | -rw-r--r-- | 3.2 KB |
| builtin-diff.c | -rw-r--r-- | 8.7 KB |
| builtin-fast-export.c | -rwxr-xr-x | 10.1 KB |
| builtin-fetch--tool.c | -rw-r--r-- | 12.7 KB |
| builtin-fetch-pack.c | -rw-r--r-- | 17.9 KB |
| builtin-fetch.c | -rw-r--r-- | 16.2 KB |
| builtin-fmt-merge-msg.c | -rw-r--r-- | 7.6 KB |
| builtin-for-each-ref.c | -rw-r--r-- | 21.1 KB |
| builtin-fsck.c | -rw-r--r-- | 18.3 KB |
| builtin-gc.c | -rw-r--r-- | 5.7 KB |
| builtin-grep.c | -rw-r--r-- | 18.1 KB |
| builtin-http-fetch.c | -rw-r--r-- | 2.1 KB |
| builtin-init-db.c | -rw-r--r-- | 11.2 KB |
| builtin-log.c | -rw-r--r-- | 23.8 KB |
| builtin-ls-files.c | -rw-r--r-- | 14.5 KB |
| builtin-ls-remote.c | -rw-r--r-- | 2.4 KB |
| builtin-ls-tree.c | -rw-r--r-- | 4.4 KB |
| builtin-mailinfo.c | -rw-r--r-- | 20.0 KB |
| builtin-mailsplit.c | -rw-r--r-- | 6.1 KB |
| builtin-merge-base.c | -rw-r--r-- | 1.2 KB |
| builtin-merge-file.c | -rw-r--r-- | 1.6 KB |
| builtin-merge-ours.c | -rw-r--r-- | 751 bytes |
| builtin-mv.c | -rw-r--r-- | 7.2 KB |
| builtin-name-rev.c | -rw-r--r-- | 6.3 KB |
| builtin-pack-objects.c | -rw-r--r-- | 56.9 KB |
| builtin-pack-refs.c | -rw-r--r-- | 3.4 KB |
| builtin-prune-packed.c | -rw-r--r-- | 1.9 KB |
| builtin-prune.c | -rw-r--r-- | 2.3 KB |
| builtin-push.c | -rw-r--r-- | 3.8 KB |
| builtin-read-tree.c | -rw-r--r-- | 6.8 KB |
| builtin-reflog.c | -rw-r--r-- | 9.8 KB |
| builtin-rerere.c | -rw-r--r-- | 10.7 KB |
| builtin-reset.c | -rw-r--r-- | 7.2 KB |
| builtin-rev-list.c | -rw-r--r-- | 15.0 KB |
| builtin-rev-parse.c | -rw-r--r-- | 12.0 KB |
| builtin-revert.c | -rw-r--r-- | 10.6 KB |
| builtin-rm.c | -rw-r--r-- | 6.3 KB |
| builtin-send-pack.c | -rw-r--r-- | 15.0 KB |
| builtin-shortlog.c | -rw-r--r-- | 6.9 KB |
| builtin-show-branch.c | -rw-r--r-- | 21.1 KB |
| builtin-show-ref.c | -rw-r--r-- | 5.8 KB |
| builtin-stripspace.c | -rw-r--r-- | 1.9 KB |
| builtin-symbolic-ref.c | -rw-r--r-- | 1.2 KB |
| builtin-tag.c | -rw-r--r-- | 10.8 KB |
| builtin-tar-tree.c | -rw-r--r-- | 2.1 KB |
| builtin-unpack-objects.c | -rw-r--r-- | 8.6 KB |
| builtin-update-index.c | -rw-r--r-- | 18.9 KB |
| builtin-update-ref.c | -rw-r--r-- | 1.4 KB |
| builtin-upload-archive.c | -rw-r--r-- | 4.1 KB |
| builtin-verify-pack.c | -rw-r--r-- | 1.7 KB |
| builtin-verify-tag.c | -rw-r--r-- | 2.5 KB |
| builtin-write-tree.c | -rw-r--r-- | 2.2 KB |
| builtin.h | -rw-r--r-- | 6.4 KB |
| bundle.c | -rw-r--r-- | 9.2 KB |
| bundle.h | -rw-r--r-- | 627 bytes |
| cache-tree.c | -rw-r--r-- | 12.0 KB |
| cache-tree.h | -rw-r--r-- | 914 bytes |
| cache.h | -rw-r--r-- | 23.4 KB |
| check-builtins.sh | -rwxr-xr-x | 588 bytes |
| check-racy.c | -rw-r--r-- | 538 bytes |
| color.c | -rw-r--r-- | 3.4 KB |
| color.h | -rw-r--r-- | 417 bytes |
| combine-diff.c | -rw-r--r-- | 26.4 KB |
| command-list.txt | -rw-r--r-- | 7.5 KB |
| commit.c | -rw-r--r-- | 15.0 KB |
| commit.h | -rw-r--r-- | 3.6 KB |
| config.c | -rw-r--r-- | 23.3 KB |
| config.mak.in | -rw-r--r-- | 1.1 KB |
| configure.ac | -rw-r--r-- | 14.6 KB |
| connect.c | -rw-r--r-- | 13.3 KB |
| convert.c | -rw-r--r-- | 13.0 KB |
| copy.c | -rw-r--r-- | 688 bytes |
| csum-file.c | -rw-r--r-- | 2.3 KB |
| csum-file.h | -rw-r--r-- | 640 bytes |
| ctype.c | -rw-r--r-- | 889 bytes |
| daemon.c | -rw-r--r-- | 26.7 KB |
| date.c | -rw-r--r-- | 18.5 KB |
| decorate.c | -rw-r--r-- | 1.8 KB |
| decorate.h | -rw-r--r-- | 382 bytes |
| delta.h | -rw-r--r-- | 3.4 KB |
| diff-delta.c | -rw-r--r-- | 15.3 KB |
| diff-lib.c | -rw-r--r-- | 17.6 KB |
| diff.c | -rw-r--r-- | 80.2 KB |
| diff.h | -rw-r--r-- | 8.2 KB |
| diffcore-break.c | -rw-r--r-- | 8.7 KB |
| diffcore-delta.c | -rw-r--r-- | 5.3 KB |
| diffcore-order.c | -rw-r--r-- | 2.2 KB |
| diffcore-pickaxe.c | -rw-r--r-- | 3.3 KB |
| diffcore-rename.c | -rw-r--r-- | 15.8 KB |
| diffcore.h | -rw-r--r-- | 4.0 KB |
| dir.c | -rw-r--r-- | 19.0 KB |
| dir.h | -rw-r--r-- | 2.1 KB |
| dump-cache-tree.c | -rw-r--r-- | 1.5 KB |
| entry.c | -rw-r--r-- | 5.8 KB |
| environment.c | -rw-r--r-- | 3.6 KB |
| exec_cmd.c | -rw-r--r-- | 2.2 KB |
| exec_cmd.h | -rw-r--r-- | 329 bytes |
| fast-import.c | -rw-r--r-- | 61.2 KB |
| fetch-pack.h | -rw-r--r-- | 378 bytes |
| fixup-builtins | -rwxr-xr-x | 326 bytes |
| generate-cmdlist.sh | -rwxr-xr-x | 442 bytes |
| git-add--interactive.perl | -rwxr-xr-x | 21.5 KB |
| git-am.sh | -rwxr-xr-x | 11.1 KB |
| git-archimport.perl | -rwxr-xr-x | 36.0 KB |
| git-bisect.sh | -rwxr-xr-x | 10.3 KB |
| git-checkout.sh | -rwxr-xr-x | 7.4 KB |
| git-clone.sh | -rwxr-xr-x | 11.4 KB |
| git-compat-util.h | -rw-r--r-- | 9.4 KB |
| git-cvsexportcommit.perl | -rwxr-xr-x | 9.5 KB |
| git-cvsimport.perl | -rwxr-xr-x | 26.1 KB |
| git-cvsserver.perl | -rwxr-xr-x | 99.7 KB |
| git-filter-branch.sh | -rwxr-xr-x | 9.7 KB |
| git-help--browse.sh | -rwxr-xr-x | 3.3 KB |
| git-instaweb.sh | -rwxr-xr-x | 6.2 KB |
| git-lost-found.sh | -rwxr-xr-x | 563 bytes |
| git-merge-octopus.sh | -rwxr-xr-x | 2.4 KB |
| git-merge-one-file.sh | -rwxr-xr-x | 3.4 KB |
| git-merge-resolve.sh | -rwxr-xr-x | 954 bytes |
| git-merge-stupid.sh | -rwxr-xr-x | 1.4 KB |
| git-merge.sh | -rwxr-xr-x | 12.0 KB |
| git-mergetool.sh | -rwxr-xr-x | 9.1 KB |
| git-parse-remote.sh | -rwxr-xr-x | 5.8 KB |
| git-pull.sh | -rwxr-xr-x | 4.8 KB |
| git-quiltimport.sh | -rwxr-xr-x | 3.0 KB |
| git-rebase--interactive.sh | -rwxr-xr-x | 12.6 KB |
| git-rebase.sh | -rwxr-xr-x | 10.0 KB |
| git-relink.perl | -rwxr-xr-x | 4.0 KB |
| git-remote.perl | -rwxr-xr-x | 10.1 KB |
| git-repack.sh | -rwxr-xr-x | 3.4 KB |
| git-request-pull.sh | -rwxr-xr-x | 1.3 KB |
| git-send-email.perl | -rwxr-xr-x | 22.5 KB |
| git-sh-setup.sh | -rwxr-xr-x | 3.2 KB |
| git-stash.sh | -rwxr-xr-x | 5.0 KB |
| git-submodule.sh | -rwxr-xr-x | 8.3 KB |
| git-svn.perl | -rwxr-xr-x | 135.1 KB |
| git.c | -rw-r--r-- | 12.6 KB |
| git.spec.in | -rw-r--r-- | 8.6 KB |
| grep.c | -rw-r--r-- | 12.7 KB |
| grep.h | -rw-r--r-- | 1.6 KB |
| hash-object.c | -rw-r--r-- | 1.9 KB |
| hash.c | -rw-r--r-- | 2.5 KB |
| hash.h | -rw-r--r-- | 1.1 KB |
| help.c | -rw-r--r-- | 8.3 KB |
| http-push.c | -rw-r--r-- | 64.0 KB |
| http-walker.c | -rw-r--r-- | 23.7 KB |
| http.c | -rw-r--r-- | 14.2 KB |
| http.h | -rw-r--r-- | 2.7 KB |
| ident.c | -rw-r--r-- | 5.8 KB |
| imap-send.c | -rw-r--r-- | 28.4 KB |
| index-pack.c | -rw-r--r-- | 22.2 KB |
| interpolate.c | -rw-r--r-- | 2.1 KB |
| interpolate.h | -rw-r--r-- | 601 bytes |
| list-objects.c | -rw-r--r-- | 4.7 KB |
| list-objects.h | -rw-r--r-- | 382 bytes |
| lockfile.c | -rw-r--r-- | 4.7 KB |
| log-tree.c | -rw-r--r-- | 9.9 KB |
| log-tree.h | -rw-r--r-- | 432 bytes |
| mailmap.c | -rw-r--r-- | 2.2 KB |
| mailmap.h | -rw-r--r-- | 213 bytes |
| match-trees.c | -rw-r--r-- | 7.1 KB |
| merge-file.c | -rw-r--r-- | 2.4 KB |
| merge-index.c | -rw-r--r-- | 2.4 KB |
| merge-recursive.c | -rw-r--r-- | 44.2 KB |
| merge-tree.c | -rw-r--r-- | 7.9 KB |
| mktag.c | -rw-r--r-- | 3.7 KB |
| mktree.c | -rw-r--r-- | 3.0 KB |
| object-refs.c | -rw-r--r-- | 2.0 KB |
| object.c | -rw-r--r-- | 5.6 KB |
| object.h | -rw-r--r-- | 2.3 KB |
| pack-check.c | -rw-r--r-- | 5.1 KB |
| pack-redundant.c | -rw-r--r-- | 14.9 KB |
| pack-write.c | -rw-r--r-- | 5.5 KB |
| pack.h | -rw-r--r-- | 2.0 KB |
| pager.c | -rw-r--r-- | 1.4 KB |
| parse-options.c | -rw-r--r-- | 9.5 KB |
| parse-options.h | -rw-r--r-- | 3.8 KB |
| patch-delta.c | -rw-r--r-- | 2.2 KB |
| patch-id.c | -rw-r--r-- | 1.6 KB |
| patch-ids.c | -rw-r--r-- | 4.7 KB |
| patch-ids.h | -rw-r--r-- | 490 bytes |
| path-list.c | -rw-r--r-- | 2.3 KB |
| path-list.h | -rw-r--r-- | 596 bytes |
| path.c | -rw-r--r-- | 7.6 KB |
| pkt-line.c | -rw-r--r-- | 2.5 KB |
| pkt-line.h | -rw-r--r-- | 348 bytes |
| pretty.c | -rw-r--r-- | 20.0 KB |
| progress.c | -rw-r--r-- | 6.2 KB |
| progress.h | -rw-r--r-- | 504 bytes |
| quote.c | -rw-r--r-- | 8.8 KB |
| quote.h | -rw-r--r-- | 2.0 KB |
| reachable.c | -rw-r--r-- | 5.5 KB |
| reachable.h | -rw-r--r-- | 127 bytes |
| read-cache.c | -rw-r--r-- | 29.9 KB |
| receive-pack.c | -rw-r--r-- | 11.7 KB |
| reflog-walk.c | -rw-r--r-- | 6.7 KB |
| reflog-walk.h | -rw-r--r-- | 383 bytes |
| refs.c | -rw-r--r-- | 35.6 KB |
| refs.h | -rw-r--r-- | 2.6 KB |
| remote.c | -rw-r--r-- | 21.0 KB |
| remote.h | -rw-r--r-- | 2.6 KB |
| revision.c | -rw-r--r-- | 38.7 KB |
| revision.h | -rw-r--r-- | 3.4 KB |
| run-command.c | -rw-r--r-- | 4.6 KB |
| run-command.h | -rw-r--r-- | 1.8 KB |
| send-pack.h | -rw-r--r-- | 338 bytes |
| server-info.c | -rw-r--r-- | 5.2 KB |
| setup.c | -rw-r--r-- | 9.5 KB |
| sha1_file.c | -rw-r--r-- | 59.8 KB |
| sha1_name.c | -rw-r--r-- | 16.1 KB |
| shallow.c | -rw-r--r-- | 2.3 KB |
| shell.c | -rw-r--r-- | 1.5 KB |
| show-index.c | -rw-r--r-- | 2.1 KB |
| sideband.c | -rw-r--r-- | 3.0 KB |
| sideband.h | -rw-r--r-- | 335 bytes |
| strbuf.c | -rw-r--r-- | 4.9 KB |
| strbuf.h | -rw-r--r-- | 4.2 KB |
| symlinks.c | -rw-r--r-- | 862 bytes |
| tag.c | -rw-r--r-- | 2.8 KB |
| tag.h | -rw-r--r-- | 471 bytes |
| tar.h | -rw-r--r-- | 644 bytes |
| test-absolute-path.c | -rw-r--r-- | 147 bytes |
| test-chmtime.c | -rw-r--r-- | 1.2 KB |
| test-date.c | -rw-r--r-- | 378 bytes |
| test-delta.c | -rw-r--r-- | 1.8 KB |
| test-genrandom.c | -rw-r--r-- | 731 bytes |
| test-match-trees.c | -rw-r--r-- | 588 bytes |
| test-parse-options.c | -rw-r--r-- | 1.0 KB |
| test-sha1.c | -rw-r--r-- | 815 bytes |
| test-sha1.sh | -rwxr-xr-x | 1.8 KB |
| trace.c | -rw-r--r-- | 3.5 KB |
| transport.c | -rw-r--r-- | 18.9 KB |
| transport.h | -rw-r--r-- | 2.1 KB |
| tree-diff.c | -rw-r--r-- | 11.1 KB |
| tree-walk.c | -rw-r--r-- | 4.4 KB |
| tree-walk.h | -rw-r--r-- | 1.2 KB |
| tree.c | -rw-r--r-- | 7.3 KB |
| tree.h | -rw-r--r-- | 860 bytes |
| unpack-file.c | -rw-r--r-- | 772 bytes |
| unpack-trees.c | -rw-r--r-- | 21.4 KB |
| unpack-trees.h | -rw-r--r-- | 940 bytes |
| update-server-info.c | -rw-r--r-- | 457 bytes |
| upload-pack.c | -rw-r--r-- | 15.0 KB |
| usage.c | -rw-r--r-- | 2.0 KB |
| utf8.c | -rw-r--r-- | 11.1 KB |
| utf8.h | -rw-r--r-- | 541 bytes |
| var.c | -rw-r--r-- | 1.3 KB |
| walker.c | -rw-r--r-- | 7.1 KB |
| walker.h | -rw-r--r-- | 1.1 KB |
| write_or_die.c | -rw-r--r-- | 2.3 KB |
| ws.c | -rw-r--r-- | 4.7 KB |
| wt-status.c | -rw-r--r-- | 10.5 KB |
| wt-status.h | -rw-r--r-- | 711 bytes |
| xdiff-interface.c | -rw-r--r-- | 5.3 KB |
| xdiff-interface.h | -rw-r--r-- | 742 bytes |
Computing file changes ...
