summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-02-10rebase: use @{upstream} if no upstream specifiedLibravatar Martin von Zweigbergk6-46/+85
2011-02-10rebase -i: remove unnecessary state rebase-rootLibravatar Martin von Zweigbergk1-19/+0
2011-02-10rebase -i: don't read unused variable preserve_mergesLibravatar Martin von Zweigbergk1-1/+0
2011-02-10git-rebase--am: remove unnecessary --3way optionLibravatar Martin von Zweigbergk1-2/+2
2011-02-10rebase -m: don't print exit code 2 when merge failsLibravatar Martin von Zweigbergk1-1/+1
2011-02-10rebase -m: remember allow_rerere_autoupdate optionLibravatar Martin von Zweigbergk2-0/+25
2011-02-10rebase: remember strategy and strategy optionsLibravatar Martin von Zweigbergk3-2/+35
2011-02-10rebase: remember verbose optionLibravatar Martin von Zweigbergk2-4/+4
2011-02-10rebase: extract code for writing basic stateLibravatar Martin von Zweigbergk4-16/+16
2011-02-10rebase: factor out sub command handlingLibravatar Martin von Zweigbergk2-33/+18
2011-02-10rebase: make -v a tiny bit more verboseLibravatar Martin von Zweigbergk2-16/+16
2011-02-10rebase -i: align variable namesLibravatar Martin von Zweigbergk1-61/+59
2011-02-10rebase: show consistent conflict resolution hintLibravatar Martin von Zweigbergk1-3/+1
2011-02-10rebase: extract am code to new source fileLibravatar Martin von Zweigbergk4-29/+38
2011-02-10rebase: extract merge code to new source fileLibravatar Martin von Zweigbergk4-151/+167
2011-02-10rebase: remove $branch as synonym for $orig_headLibravatar Martin von Zweigbergk1-10/+9
2011-02-10rebase -i: support --statLibravatar Martin von Zweigbergk1-7/+7
2011-02-10rebase: factor out call to pre-rebase hookLibravatar Martin von Zweigbergk2-19/+7
2011-02-10rebase: factor out clean work tree checkLibravatar Martin von Zweigbergk2-4/+2
2011-02-10rebase: factor out reference parsingLibravatar Martin von Zweigbergk2-48/+9
2011-02-10rebase: reorder validation stepsLibravatar Martin von Zweigbergk2-7/+7
2011-02-10rebase -i: remove now unnecessary directory checksLibravatar Martin von Zweigbergk1-6/+0
2011-02-10rebase: factor out command line option processingLibravatar Martin von Zweigbergk2-182/+100
2011-02-10rebase: align variable contentLibravatar Martin von Zweigbergk2-6/+14
2011-02-10rebase: align variable namesLibravatar Martin von Zweigbergk2-256/+256
2011-02-10rebase: stricter check of standalone sub commandLibravatar Martin von Zweigbergk4-2/+22
2011-02-10rebase: act on command line outside parsing loopLibravatar Martin von Zweigbergk2-209/+217
2011-02-10rebase: improve detection of rebase in progressLibravatar Martin von Zweigbergk1-39/+41
2011-02-10rebase: remove unused rebase state 'prev_head'Libravatar Martin von Zweigbergk1-8/+0
2011-02-10rebase: read state outside loopLibravatar Martin von Zweigbergk1-2/+2
2011-02-10rebase: refactor reading of stateLibravatar Martin von Zweigbergk1-30/+23
2011-02-10rebase: clearer names for directory variablesLibravatar Martin von Zweigbergk1-70/+71
2011-02-09Merge branch 'tr/merge-unborn-clobber'Libravatar Junio C Hamano1-0/+16
2011-02-09Merge branch 'jc/unpack-trees'Libravatar Junio C Hamano1-2/+62
2011-02-09Merge branch 'jc/fsck-fixes'Libravatar Junio C Hamano1-9/+22
2011-02-09Merge branch 'tr/diff-words-test'Libravatar Junio C Hamano41-255/+933
2011-02-09Merge branch 'rr/fi-import-marks-if-exists'Libravatar Junio C Hamano3-3/+72
2011-02-09Merge branch 'jn/unpack-lstat-failure-report'Libravatar Junio C Hamano1-6/+12
2011-02-09Merge branch 'ef/alias-via-run-command'Libravatar Junio C Hamano1-17/+17
2011-02-09Merge branch 'cb/setup'Libravatar Junio C Hamano1-4/+7
2011-02-09Merge branch 'ae/better-template-failure-report'Libravatar Junio C Hamano4-4/+56
2011-02-09Merge branch 'jn/cherry-pick-strategy-option'Libravatar Junio C Hamano7-11/+97
2011-02-09Merge branch 'maint-1.7.0' into maintLibravatar Junio C Hamano3-0/+10
2011-02-09fast-import: introduce "feature notes" commandLibravatar Jonathan Nieder3-0/+9
2011-02-09fast-import: clarify documentation of "feature" commandLibravatar Jonathan Nieder1-20/+17
2011-02-09Documentation/merge subtree How-To: fix typoLibravatar Uwe Kleine-König1-1/+1
2011-02-07pull: Document the "--[no-]recurse-submodules" optionsLibravatar Jens Lehmann2-2/+9
2011-02-07quote.h: simplify the inclusionLibravatar Jonathan Nieder1-2/+1
2011-02-07sha1_object_info: examine cached_object store tooLibravatar Nguyễn Thái Ngọc Duy1-0/+8
2011-02-07sha1_file.c: move find_cached_object up so sha1_object_info can use itLibravatar Nguyễn Thái Ngọc Duy1-35/+35