Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
git:gitconfig [2009/02/19 03:39] janakj |
git:gitconfig [2009/04/16 17:25] (current) 212.227.35.68 |
||
---|---|---|---|
Line 104: | Line 104: | ||
# another branch was merged. I find this easier to understand and read in | # another branch was merged. I find this easier to understand and read in | ||
# the log. | # the log. | ||
- | mergeoptions = --no-commit --no-ff | + | |