git-gui: fix deleting item from all_remotes variable

Heiko Voigt committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Git 1.7.4.1

Junio C Hamano committed over 15 years ago

Merge branch 'jc/fsck-fixes' into maint

Junio C Hamano committed over 15 years ago

clone: fixup recurse_submodules option

Chris Packham committed over 15 years ago

svn-fe: warn about experimental status

Jonathan Nieder committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

rebase: use @{upstream} if no upstream specified

Martin von Zweigbergk committed over 15 years ago

rebase -i: remove unnecessary state rebase-root

Martin von Zweigbergk committed over 15 years ago

rebase -i: don't read unused variable preserve_merges

Martin von Zweigbergk committed over 15 years ago

git-rebase--am: remove unnecessary --3way option

Martin von Zweigbergk committed over 15 years ago

rebase -m: don't print exit code 2 when merge fails

Martin von Zweigbergk committed over 15 years ago

rebase -m: remember allow_rerere_autoupdate option

Martin von Zweigbergk committed over 15 years ago

rebase: remember strategy and strategy options

Martin von Zweigbergk committed over 15 years ago

rebase: remember verbose option

Martin von Zweigbergk committed over 15 years ago

rebase: extract code for writing basic state

Martin von Zweigbergk committed over 15 years ago

rebase: factor out sub command handling

Martin von Zweigbergk committed over 15 years ago

rebase: make -v a tiny bit more verbose

Martin von Zweigbergk committed over 15 years ago

rebase -i: align variable names

Martin von Zweigbergk committed over 15 years ago

rebase: show consistent conflict resolution hint

Martin von Zweigbergk committed over 15 years ago