Gecko [ 122.154.134.11 ]

Name	Size	Permission
git	1.09 MB	-rwxr-xr-x
git-add	1.09 MB	-rwxr-xr-x
git-add--interactive	34.88 KB	-rwxr-xr-x
git-am	18.59 KB	-rwxr-xr-x
git-annotate	1.09 MB	-rwxr-xr-x
git-apply	1.09 MB	-rwxr-xr-x
git-archive	1.09 MB	-rwxr-xr-x
git-bisect	9.79 KB	-rwxr-xr-x
git-bisect--helper	1.09 MB	-rwxr-xr-x
git-blame	1.09 MB	-rwxr-xr-x
git-branch	1.09 MB	-rwxr-xr-x
git-bundle	1.09 MB	-rwxr-xr-x
git-cat-file	1.09 MB	-rwxr-xr-x
git-check-attr	1.09 MB	-rwxr-xr-x
git-check-ref-format	1.09 MB	-rwxr-xr-x
git-checkout	1.09 MB	-rwxr-xr-x
git-checkout-index	1.09 MB	-rwxr-xr-x
git-cherry	1.09 MB	-rwxr-xr-x
git-cherry-pick	1.09 MB	-rwxr-xr-x
git-clean	1.09 MB	-rwxr-xr-x
git-clone	1.09 MB	-rwxr-xr-x
git-commit	1.09 MB	-rwxr-xr-x
git-commit-tree	1.09 MB	-rwxr-xr-x
git-config	1.09 MB	-rwxr-xr-x
git-count-objects	1.09 MB	-rwxr-xr-x
git-describe	1.09 MB	-rwxr-xr-x
git-diff	1.09 MB	-rwxr-xr-x
git-diff-files	1.09 MB	-rwxr-xr-x
git-diff-index	1.09 MB	-rwxr-xr-x
git-diff-tree	1.09 MB	-rwxr-xr-x
git-difftool	2.63 KB	-rwxr-xr-x
git-difftool--helper	1.7 KB	-rwxr-xr-x
git-fast-export	1.09 MB	-rwxr-xr-x
git-fast-import	490.63 KB	-rwxr-xr-x
git-fetch	1.09 MB	-rwxr-xr-x
git-fetch-pack	1.09 MB	-rwxr-xr-x
git-filter-branch	11.89 KB	-rwxr-xr-x
git-fmt-merge-msg	1.09 MB	-rwxr-xr-x
git-for-each-ref	1.09 MB	-rwxr-xr-x
git-format-patch	1.09 MB	-rwxr-xr-x
git-fsck	1.09 MB	-rwxr-xr-x
git-fsck-objects	1.09 MB	-rwxr-xr-x
git-gc	1.09 MB	-rwxr-xr-x
git-get-tar-commit-id	1.09 MB	-rwxr-xr-x
git-grep	1.09 MB	-rwxr-xr-x
git-hash-object	1.09 MB	-rwxr-xr-x
git-help	1.09 MB	-rwxr-xr-x
git-http-backend	458.82 KB	-rwxr-xr-x
git-http-fetch	489.99 KB	-rwxr-xr-x
git-http-push	505.5 KB	-rwxr-xr-x
git-imap-send	481.96 KB	-rwxr-xr-x
git-index-pack	1.09 MB	-rwxr-xr-x
git-init	1.09 MB	-rwxr-xr-x
git-init-db	1.09 MB	-rwxr-xr-x
git-instaweb	242.57 KB	-rwxr-xr-x
git-log	1.09 MB	-rwxr-xr-x
git-lost-found	554 B	-rwxr-xr-x
git-ls-files	1.09 MB	-rwxr-xr-x
git-ls-remote	1.09 MB	-rwxr-xr-x
git-ls-tree	1.09 MB	-rwxr-xr-x
git-mailinfo	1.09 MB	-rwxr-xr-x
git-mailsplit	1.09 MB	-rwxr-xr-x
git-merge	1.09 MB	-rwxr-xr-x
git-merge-base	1.09 MB	-rwxr-xr-x
git-merge-file	1.09 MB	-rwxr-xr-x
git-merge-index	1.09 MB	-rwxr-xr-x
git-merge-octopus	2.02 KB	-rwxr-xr-x
git-merge-one-file	3.72 KB	-rwxr-xr-x
git-merge-ours	1.09 MB	-rwxr-xr-x
git-merge-recursive	1.09 MB	-rwxr-xr-x
git-merge-resolve	944 B	-rwxr-xr-x
git-merge-subtree	1.09 MB	-rwxr-xr-x
git-merge-tree	1.09 MB	-rwxr-xr-x
git-mergetool	5.96 KB	-rwxr-xr-x
git-mergetool--lib	8.79 KB	-rw-r--r--
git-mktag	1.09 MB	-rwxr-xr-x
git-mktree	1.09 MB	-rwxr-xr-x
git-mv	1.09 MB	-rwxr-xr-x
git-name-rev	1.09 MB	-rwxr-xr-x
git-notes	1.09 MB	-rwxr-xr-x
git-pack-objects	1.09 MB	-rwxr-xr-x
git-pack-redundant	1.09 MB	-rwxr-xr-x
git-pack-refs	1.09 MB	-rwxr-xr-x
git-parse-remote	1.9 KB	-rw-r--r--
git-patch-id	1.09 MB	-rwxr-xr-x
git-peek-remote	1.09 MB	-rwxr-xr-x
git-prune	1.09 MB	-rwxr-xr-x
git-prune-packed	1.09 MB	-rwxr-xr-x
git-pull	7.84 KB	-rwxr-xr-x
git-push	1.09 MB	-rwxr-xr-x
git-quiltimport	3.27 KB	-rwxr-xr-x
git-read-tree	1.09 MB	-rwxr-xr-x
git-rebase	14.3 KB	-rwxr-xr-x
git-rebase--interactive	24.33 KB	-rwxr-xr-x
git-receive-pack	1.09 MB	-rwxr-xr-x
git-reflog	1.09 MB	-rwxr-xr-x
git-relink	4.1 KB	-rwxr-xr-x
git-remote	1.09 MB	-rwxr-xr-x
git-remote-ftp	498.63 KB	-rwxr-xr-x
git-remote-ftps	498.63 KB	-rwxr-xr-x
git-remote-http	498.63 KB	-rwxr-xr-x
git-remote-https	498.63 KB	-rwxr-xr-x
git-repack	4.39 KB	-rwxr-xr-x
git-replace	1.09 MB	-rwxr-xr-x
git-repo-config	1.09 MB	-rwxr-xr-x
git-request-pull	1.55 KB	-rwxr-xr-x
git-rerere	1.09 MB	-rwxr-xr-x
git-reset	1.09 MB	-rwxr-xr-x
git-rev-list	1.09 MB	-rwxr-xr-x
git-rev-parse	1.09 MB	-rwxr-xr-x
git-revert	1.09 MB	-rwxr-xr-x
git-rm	1.09 MB	-rwxr-xr-x
git-send-pack	1.09 MB	-rwxr-xr-x
git-sh-setup	3.92 KB	-rw-r--r--
git-shell	450.64 KB	-rwxr-xr-x
git-shortlog	1.09 MB	-rwxr-xr-x
git-show	1.09 MB	-rwxr-xr-x
git-show-branch	1.09 MB	-rwxr-xr-x
git-show-index	13.16 KB	-rwxr-xr-x
git-show-ref	1.09 MB	-rwxr-xr-x
git-stage	1.09 MB	-rwxr-xr-x
git-stash	8.63 KB	-rwxr-xr-x
git-status	1.09 MB	-rwxr-xr-x
git-stripspace	1.09 MB	-rwxr-xr-x
git-submodule	17.37 KB	-rwxr-xr-x
git-symbolic-ref	1.09 MB	-rwxr-xr-x
git-tag	1.09 MB	-rwxr-xr-x
git-tar-tree	1.09 MB	-rwxr-xr-x
git-unpack-file	1.09 MB	-rwxr-xr-x
git-unpack-objects	1.09 MB	-rwxr-xr-x
git-update-index	1.09 MB	-rwxr-xr-x
git-update-ref	1.09 MB	-rwxr-xr-x
git-update-server-info	1.09 MB	-rwxr-xr-x
git-upload-archive	1.09 MB	-rwxr-xr-x
git-upload-pack	460.71 KB	-rwxr-xr-x
git-var	1.09 MB	-rwxr-xr-x
git-verify-pack	1.09 MB	-rwxr-xr-x
git-verify-tag	1.09 MB	-rwxr-xr-x
git-web--browse	3.87 KB	-rwxr-xr-x
git-whatchanged	1.09 MB	-rwxr-xr-x
git-write-tree	1.09 MB	-rwxr-xr-x

Name

Size

Permission

Action

git

1.09 MB

-rwxr-xr-x

git-add

1.09 MB

-rwxr-xr-x

git-add--interactive

34.88 KB

-rwxr-xr-x

git-am

18.59 KB

-rwxr-xr-x

git-annotate

1.09 MB

-rwxr-xr-x

git-apply

1.09 MB

-rwxr-xr-x

git-archive

1.09 MB

-rwxr-xr-x

git-bisect

9.79 KB

-rwxr-xr-x

git-bisect--helper

1.09 MB

-rwxr-xr-x

git-blame

1.09 MB

-rwxr-xr-x

git-branch

1.09 MB

-rwxr-xr-x

git-bundle

1.09 MB

-rwxr-xr-x

git-cat-file

1.09 MB

-rwxr-xr-x

git-check-attr

1.09 MB

-rwxr-xr-x

git-check-ref-format

1.09 MB

-rwxr-xr-x

git-checkout

1.09 MB

-rwxr-xr-x

git-checkout-index

1.09 MB

-rwxr-xr-x

git-cherry

1.09 MB

-rwxr-xr-x

git-cherry-pick

1.09 MB

-rwxr-xr-x

git-clean

1.09 MB

-rwxr-xr-x

git-clone

1.09 MB

-rwxr-xr-x

git-commit

1.09 MB

-rwxr-xr-x

git-commit-tree

1.09 MB

-rwxr-xr-x

git-config

1.09 MB

-rwxr-xr-x

git-count-objects

1.09 MB

-rwxr-xr-x

git-describe

1.09 MB

-rwxr-xr-x

git-diff

1.09 MB

-rwxr-xr-x

git-diff-files

1.09 MB

-rwxr-xr-x

git-diff-index

1.09 MB

-rwxr-xr-x

git-diff-tree

1.09 MB

-rwxr-xr-x

git-difftool

2.63 KB

-rwxr-xr-x

git-difftool--helper

1.7 KB

-rwxr-xr-x

git-fast-export

1.09 MB

-rwxr-xr-x

git-fast-import

490.63 KB

-rwxr-xr-x

git-fetch

1.09 MB

-rwxr-xr-x

git-fetch-pack

1.09 MB

-rwxr-xr-x

git-filter-branch

11.89 KB

-rwxr-xr-x

git-fmt-merge-msg

1.09 MB

-rwxr-xr-x

git-for-each-ref

1.09 MB

-rwxr-xr-x

git-format-patch

1.09 MB

-rwxr-xr-x

git-fsck

1.09 MB

-rwxr-xr-x

git-fsck-objects

1.09 MB

-rwxr-xr-x

git-gc

1.09 MB

-rwxr-xr-x

git-get-tar-commit-id

1.09 MB

-rwxr-xr-x

git-grep

1.09 MB

-rwxr-xr-x

git-hash-object

1.09 MB

-rwxr-xr-x

git-help

1.09 MB

-rwxr-xr-x

git-http-backend

458.82 KB

-rwxr-xr-x

git-http-fetch

489.99 KB

-rwxr-xr-x

git-http-push

505.5 KB

-rwxr-xr-x

git-imap-send

481.96 KB

-rwxr-xr-x

git-index-pack

1.09 MB

-rwxr-xr-x

git-init

1.09 MB

-rwxr-xr-x

git-init-db

1.09 MB

-rwxr-xr-x

git-instaweb

242.57 KB

-rwxr-xr-x

git-log

1.09 MB

-rwxr-xr-x

git-lost-found

554 B

-rwxr-xr-x

git-ls-files

1.09 MB

-rwxr-xr-x

git-ls-remote

1.09 MB

-rwxr-xr-x

git-ls-tree

1.09 MB

-rwxr-xr-x

git-mailinfo

1.09 MB

-rwxr-xr-x

git-mailsplit

1.09 MB

-rwxr-xr-x

git-merge

1.09 MB

-rwxr-xr-x

git-merge-base

1.09 MB

-rwxr-xr-x

git-merge-file

1.09 MB

-rwxr-xr-x

git-merge-index

1.09 MB

-rwxr-xr-x

git-merge-octopus

2.02 KB

-rwxr-xr-x

git-merge-one-file

3.72 KB

-rwxr-xr-x

git-merge-ours

1.09 MB

-rwxr-xr-x

git-merge-recursive

1.09 MB

-rwxr-xr-x

git-merge-resolve

944 B

-rwxr-xr-x

git-merge-subtree

1.09 MB

-rwxr-xr-x

git-merge-tree

1.09 MB

-rwxr-xr-x

git-mergetool

5.96 KB

-rwxr-xr-x

git-mergetool--lib

8.79 KB

-rw-r--r--

git-mktag

1.09 MB

-rwxr-xr-x

git-mktree

1.09 MB

-rwxr-xr-x

git-mv

1.09 MB

-rwxr-xr-x

git-name-rev

1.09 MB

-rwxr-xr-x

git-notes

1.09 MB

-rwxr-xr-x

git-pack-objects

1.09 MB

-rwxr-xr-x

git-pack-redundant

1.09 MB

-rwxr-xr-x

git-pack-refs

1.09 MB

-rwxr-xr-x

git-parse-remote

1.9 KB

-rw-r--r--

git-patch-id

1.09 MB

-rwxr-xr-x

git-peek-remote

1.09 MB

-rwxr-xr-x

git-prune

1.09 MB

-rwxr-xr-x

git-prune-packed

1.09 MB

-rwxr-xr-x

git-pull

7.84 KB

-rwxr-xr-x

git-push

1.09 MB

-rwxr-xr-x

git-quiltimport

3.27 KB

-rwxr-xr-x

git-read-tree

1.09 MB

-rwxr-xr-x

git-rebase

14.3 KB

-rwxr-xr-x

git-rebase--interactive

24.33 KB

-rwxr-xr-x

git-receive-pack

1.09 MB

-rwxr-xr-x

git-reflog

1.09 MB

-rwxr-xr-x

git-relink

4.1 KB

-rwxr-xr-x

git-remote

1.09 MB

-rwxr-xr-x

git-remote-ftp

498.63 KB

-rwxr-xr-x

git-remote-ftps

498.63 KB

-rwxr-xr-x

git-remote-http

498.63 KB

-rwxr-xr-x

git-remote-https

498.63 KB

-rwxr-xr-x

git-repack

4.39 KB

-rwxr-xr-x

git-replace

1.09 MB

-rwxr-xr-x

git-repo-config

1.09 MB

-rwxr-xr-x

git-request-pull

1.55 KB

-rwxr-xr-x

git-rerere

1.09 MB

-rwxr-xr-x

git-reset

1.09 MB

-rwxr-xr-x

git-rev-list

1.09 MB

-rwxr-xr-x

git-rev-parse

1.09 MB

-rwxr-xr-x

git-revert

1.09 MB

-rwxr-xr-x

git-rm

1.09 MB

-rwxr-xr-x

git-send-pack

1.09 MB

-rwxr-xr-x

git-sh-setup

3.92 KB

-rw-r--r--

git-shell

450.64 KB

-rwxr-xr-x

git-shortlog

1.09 MB

-rwxr-xr-x

git-show

1.09 MB

-rwxr-xr-x

git-show-branch

1.09 MB

-rwxr-xr-x

git-show-index

13.16 KB

-rwxr-xr-x

git-show-ref

1.09 MB

-rwxr-xr-x

git-stage

1.09 MB

-rwxr-xr-x

git-stash

8.63 KB

-rwxr-xr-x

git-status

1.09 MB

-rwxr-xr-x

git-stripspace

1.09 MB

-rwxr-xr-x

git-submodule

17.37 KB

-rwxr-xr-x

git-symbolic-ref

1.09 MB

-rwxr-xr-x

git-tag

1.09 MB

-rwxr-xr-x

git-tar-tree

1.09 MB

-rwxr-xr-x

git-unpack-file

1.09 MB

-rwxr-xr-x

git-unpack-objects

1.09 MB

-rwxr-xr-x

git-update-index

1.09 MB

-rwxr-xr-x

git-update-ref

1.09 MB

-rwxr-xr-x

git-update-server-info

1.09 MB

-rwxr-xr-x

git-upload-archive

1.09 MB

-rwxr-xr-x

git-upload-pack

460.71 KB

-rwxr-xr-x

git-var

1.09 MB

-rwxr-xr-x

git-verify-pack

1.09 MB

-rwxr-xr-x

git-verify-tag

1.09 MB

-rwxr-xr-x

git-web--browse

3.87 KB

-rwxr-xr-x

git-whatchanged

1.09 MB

-rwxr-xr-x

git-write-tree

1.09 MB

-rwxr-xr-x

Code Editor : git-mergetool

#!/bin/sh
#
# This program resolves merge conflicts in git
#
# Copyright (c) 2006 Theodore Y. Ts'o
#
# This file is licensed under the GPL v2, or a later version
# at the discretion of Junio C Hamano.
#

USAGE='[--tool=tool] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib
require_work_tree

# Returns true if the mode reflects a symlink
is_symlink () {
    test "$1" = 120000
}

local_present () {
    test -n "$local_mode"
}

remote_present () {
    test -n "$remote_mode"
}

base_present () {
    test -n "$base_mode"
}

cleanup_temp_files () {
    if test "$1" = --save-backup ; then
	mv -- "$BACKUP" "$MERGED.orig"
	rm -f -- "$LOCAL" "$REMOTE" "$BASE"
    else
	rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
    fi
}

describe_file () {
    mode="$1"
    branch="$2"
    file="$3"

printf "  {%s}: " "$branch"
    if test -z "$mode"; then
	echo "deleted"
    elif is_symlink "$mode" ; then
	echo "a symbolic link -> '$(cat "$file")'"
    else
	if base_present; then
	    echo "modified"
	else
	    echo "created"
	fi
    fi
}

resolve_symlink_merge () {
    while true; do
	printf "Use (l)ocal or (r)emote, or (a)bort? "
	read ans
	case "$ans" in
	    [lL]*)
		git checkout-index -f --stage=2 -- "$MERGED"
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return 0
		;;
	    [rR]*)
		git checkout-index -f --stage=3 -- "$MERGED"
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return 0
		;;
	    [aA]*)
		return 1
		;;
	    esac
	done
}

resolve_deleted_merge () {
    while true; do
	if base_present; then
	    printf "Use (m)odified or (d)eleted file, or (a)bort? "
	else
	    printf "Use (c)reated or (d)eleted file, or (a)bort? "
	fi
	read ans
	case "$ans" in
	    [mMcC]*)
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return 0
		;;
	    [dD]*)
		git rm -- "$MERGED" > /dev/null
		cleanup_temp_files
		return 0
		;;
	    [aA]*)
		return 1
		;;
	    esac
	done
}

checkout_staged_file () {
    tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '$[^	]*$	')

if test $? -eq 0 -a -n "$tmpfile" ; then
	mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
    fi
}

merge_file () {
    MERGED="$1"

f=$(git ls-files -u -- "$MERGED")
    if test -z "$f" ; then
	if test ! -f "$MERGED" ; then
	    echo "$MERGED: file not found"
	else
	    echo "$MERGED: file does not need merging"
	fi
	return 1
    fi

ext="$$$(expr "$MERGED" : '.*$\.[^/]*$$')"
    BACKUP="./$MERGED.BACKUP.$ext"
    LOCAL="./$MERGED.LOCAL.$ext"
    REMOTE="./$MERGED.REMOTE.$ext"
    BASE="./$MERGED.BASE.$ext"

mv -- "$MERGED" "$BACKUP"
    cp -- "$BACKUP" "$MERGED"

base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}')
    local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')
    remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}')

base_present   && checkout_staged_file 1 "$MERGED" "$BASE"
    local_present  && checkout_staged_file 2 "$MERGED" "$LOCAL"
    remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"

if test -z "$local_mode" -o -z "$remote_mode"; then
	echo "Deleted merge conflict for '$MERGED':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	resolve_deleted_merge
	return
    fi

if is_symlink "$local_mode" || is_symlink "$remote_mode"; then
	echo "Symbolic link merge conflict for '$MERGED':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	resolve_symlink_merge
	return
    fi

echo "Normal merge conflict for '$MERGED':"
    describe_file "$local_mode" "local" "$LOCAL"
    describe_file "$remote_mode" "remote" "$REMOTE"
    if "$prompt" = true; then
	printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
	read ans
    fi

if base_present; then
	    present=true
    else
	    present=false
    fi

if ! run_merge_tool "$merge_tool" "$present"; then
	echo "merge of $MERGED failed" 1>&2
	mv -- "$BACKUP" "$MERGED"

if test "$merge_keep_temporaries" = "false"; then
	    cleanup_temp_files
	fi

return 1
    fi

if test "$merge_keep_backup" = "true"; then
	mv -- "$BACKUP" "$MERGED.orig"
    else
	rm -- "$BACKUP"
    fi

git add -- "$MERGED"
    cleanup_temp_files
    return 0
}

prompt=$(git config --bool mergetool.prompt || echo true)

while test $# != 0
do
    case "$1" in
	-t|--tool*)
	    case "$#,$1" in
		*,*=*)
		    merge_tool=$(expr "z$1" : 'z-[^=]*=$.*$')
		    ;;
		1,*)
		    usage ;;
		*)
		    merge_tool="$2"
		    shift ;;
	    esac
	    ;;
	-y|--no-prompt)
	    prompt=false
	    ;;
	--prompt)
	    prompt=true
	    ;;
	--)
	    shift
	    break
	    ;;
	-*)
	    usage
	    ;;
	*)
	    break
	    ;;
    esac
    shift
done

prompt_after_failed_merge() {
    while true; do
	printf "Continue merging other unresolved paths (y/n) ? "
	read ans
	case "$ans" in

[yY]*)
		return 0
		;;

[nN]*)
		return 1
		;;
	esac
    done
}

if test -z "$merge_tool"; then
    merge_tool=$(get_merge_tool "$merge_tool") || exit
fi
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"

last_status=0
rollup_status=0

if test $# -eq 0 ; then
    files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
    if test -z "$files" ; then
	echo "No files need merging"
	exit 0
    fi
    echo Merging the files: "$files"
    git ls-files -u |
    sed -e 's/^[^	]*	//' |
    sort -u |
    while IFS= read i
    do
	if test $last_status -ne 0; then
	    prompt_after_failed_merge < /dev/tty || exit 1
	fi
	printf "\n"
	merge_file "$i" < /dev/tty > /dev/tty
	last_status=$?
	if test $last_status -ne 0; then
	    rollup_status=1
	fi
    done
else
    while test $# -gt 0; do
	if test $last_status -ne 0; then
	    prompt_after_failed_merge || exit 1
	fi
	printf "\n"
	merge_file "$1"
	last_status=$?
	if test $last_status -ne 0; then
	    rollup_status=1
	fi
	shift
    done
fi

exit $rollup_status

${this.title}

Code Editor : git-mergetool