android_git_merge.rc

#!/bin/bash
#
# Copyright 2015-2017 Adrian DC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

# === Git MergeTool Shortcut ===
alias gitmt='git mergetool';

# === Git MergeTool Conflicts Editor ===
function gitmte()
{
  # Usage: gitmte (Merge tool with manual conflicts resolution)

  # Files differences
  git diff --name-only | uniq;
  echo '';

  # Edit all unmerged files
  for file in $(git diff --name-only | uniq); do
    echo -n " - ${file} : ";
    fileedit "${file}";
    echo -n ' Done ? [Enter / Ctrl+C] ';
    read -r;
    git add "${file}";
  done;
}

# === Git MergeTool Referenced ===
function gitmtr()
{
  # Usage
  if [ -z "${1}" ]; then
    echo '';
    echo ' Usage: gitmtr <referenced_path> (Merge tool with reference project sources)';
    echo '';
    return;
  fi;

  # Files differences
  git diff --name-only | uniq;
  echo '';

  # Edit all unmerged files with reference
  for file in $(git diff --name-only | uniq); do
    echo -n " - ${file} : ";
    meld "${file}" "${1}/${file}";
    echo -n ' Done ? [Enter / Ctrl+C] ';
    read -r;
    git add "${file}";
  done;
}