rebase: use reflog to find common base with upstream

John Keeping committed almost 13 years ago

Merge git://repo.or.cz/git-gui

Junio C Hamano committed almost 13 years ago

Merge git://ozlabs.org/~paulus/gitk

Junio C Hamano committed almost 13 years ago

git_connect(): use common return point

Torsten Bögershausen committed almost 13 years ago

connect.c: refactor url parsing

Torsten Bögershausen committed almost 13 years ago

git_connect(): refactor the port handling for ssh

Torsten Bögershausen committed almost 13 years ago

git fetch: support host:/~repo

Torsten Bögershausen committed almost 13 years ago

t5500: add test cases for diag-url

Torsten Bögershausen committed almost 13 years ago

git fetch-pack: add --diag-url

Torsten Bögershausen committed almost 13 years ago

git_connect: factor out discovery of the protocol and its parts

Johannes Sixt committed almost 13 years ago

git_connect: remove artificial limit of a remote command

Johannes Sixt committed almost 13 years ago

rev-parse: be more careful with munging arguments

Jeff King committed almost 13 years ago

remote: fix status with branch...rebase=preserve

Felipe Contreras committed almost 13 years ago

Documentation: document pitfalls with 3-way merge

brian m. carlson committed almost 13 years ago

fetch: add missing documentation

Felipe Contreras committed almost 13 years ago

t: trivial whitespace cleanups

Felipe Contreras committed almost 13 years ago

abspath: trivial style fix

Felipe Contreras committed almost 13 years ago

remote-hg: add tests for special filenames

Felipe Contreras committed almost 13 years ago

remote-hg: fix 'shared path' path

Felipe Contreras committed almost 13 years ago

remote-helpers: add extra safety checks

Felipe Contreras committed almost 13 years ago