Untitled

root@media-b42:~/linux-bcache# git fetch git://kernel.ubuntu.com/ubuntu/ubuntu-oneiric.git

From git://kernel.ubuntu.com/ubuntu/ubuntu-oneiric

 * branch            HEAD       -> FETCH_HEAD

 

 

root@media-b42:~/linux-bcache# git merge -s ours

usage: git merge [options] [<commit>...]

   or: git merge [options] <msg> HEAD <commit>

   or: git merge --abort

 

    -n                    do not show a diffstat at the end of the merge

    --stat                show a diffstat at the end of the merge

    --summary             (synonym to --stat)

    --log[=<n>]           add (at most <n>) entries from shortlog to merge commit message

    --squash              create a single commit instead of doing a merge

    --commit              perform a commit if the merge succeeds (default)

    --ff                  allow fast-forward (default)

    --ff-only             abort if fast-forward is not possible

    --rerere-autoupdate   update the index with reused conflict resolution if possible

    -s, --strategy <strategy>

                          merge strategy to use

    -X, --strategy-option <option=value>

                          option for selected merge strategy

    -m, --message <message>

                          merge commit message (for a non-fast-forward merge)

    -v, --verbose         be more verbose

    -q, --quiet           be more quiet

    --abort               abort the current in-progress merge

    --progress            force progress reporting