Only check for upstream merges if not fast-forwarding
commit6d248aced4351b3e0a19e26fae65ca400a7d2884
authorCatalin Marinas <catalin.marinas@gmail.com>
Mon, 12 Mar 2007 22:44:20 +0000 (12 22:44 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 12 Mar 2007 22:44:20 +0000 (12 22:44 +0000)
tree3b0763dea49de4eee481632bb6bee3d0e50ebcd2
parent53f76663a55fc98d43d283dbef2306aac880d771
Only check for upstream merges if not fast-forwarding

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/common.py