~maliit-team/maliit/maliit-ubuntu-packaging-framework-precise

« back to all changes in this revision

Viewing changes to git-merge-into

  • Committer: Jan Arne Petersen
  • Date: 2012-06-12 10:04:04 UTC
  • mfrom: (26.1.14)
  • Revision ID: git-v1:3f10af9f752c195f9b615c86b446b8915f8c978e
Merge branch 'master' into precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
# ./git-merge-into $SOURCE_REV [$DEST_BRANCH...]
5
5
#
6
6
# Example:
7
 
# ./git-merge-into master lucid natty maverick natty oneric precise
 
7
# ./git-merge-into master natty oneric precise quantal
8
8
 
9
9
current_branch=`git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
10
10