TrxShell [ lionsindia.in ]

Name	Size	Permission
mergetools	[ DIR ]	drwxr-xr-x
git	2.27 MB	-rwxr-xr-x
git-add	2.27 MB	-rwxr-xr-x
git-add--interactive	42.89 KB	-rwxr-xr-x
git-am	2.27 MB	-rwxr-xr-x
git-annotate	2.27 MB	-rwxr-xr-x
git-apply	2.27 MB	-rwxr-xr-x
git-archive	2.27 MB	-rwxr-xr-x
git-bisect	14.11 KB	-rwxr-xr-x
git-bisect--helper	2.27 MB	-rwxr-xr-x
git-blame	2.27 MB	-rwxr-xr-x
git-branch	2.27 MB	-rwxr-xr-x
git-bundle	2.27 MB	-rwxr-xr-x
git-cat-file	2.27 MB	-rwxr-xr-x
git-check-attr	2.27 MB	-rwxr-xr-x
git-check-ignore	2.27 MB	-rwxr-xr-x
git-check-mailmap	2.27 MB	-rwxr-xr-x
git-check-ref-format	2.27 MB	-rwxr-xr-x
git-checkout	2.27 MB	-rwxr-xr-x
git-checkout-index	2.27 MB	-rwxr-xr-x
git-cherry	2.27 MB	-rwxr-xr-x
git-cherry-pick	2.27 MB	-rwxr-xr-x
git-clean	2.27 MB	-rwxr-xr-x
git-clone	2.27 MB	-rwxr-xr-x
git-column	2.27 MB	-rwxr-xr-x
git-commit	2.27 MB	-rwxr-xr-x
git-commit-tree	2.27 MB	-rwxr-xr-x
git-config	2.27 MB	-rwxr-xr-x
git-count-objects	2.27 MB	-rwxr-xr-x
git-credential	2.27 MB	-rwxr-xr-x
git-credential-cache	1.26 MB	-rwxr-xr-x
git-credential-cache--daemon	1.27 MB	-rwxr-xr-x
git-credential-store	1.27 MB	-rwxr-xr-x
git-daemon	1.28 MB	-rwxr-xr-x
git-describe	2.27 MB	-rwxr-xr-x
git-diff	2.27 MB	-rwxr-xr-x
git-diff-files	2.27 MB	-rwxr-xr-x
git-diff-index	2.27 MB	-rwxr-xr-x
git-diff-tree	2.27 MB	-rwxr-xr-x
git-difftool	2.27 MB	-rwxr-xr-x
git-difftool--helper	2.19 KB	-rwxr-xr-x
git-fast-export	2.27 MB	-rwxr-xr-x
git-fast-import	1.3 MB	-rwxr-xr-x
git-fetch	2.27 MB	-rwxr-xr-x
git-fetch-pack	2.27 MB	-rwxr-xr-x
git-filter-branch	15.17 KB	-rwxr-xr-x
git-fmt-merge-msg	2.27 MB	-rwxr-xr-x
git-for-each-ref	2.27 MB	-rwxr-xr-x
git-format-patch	2.27 MB	-rwxr-xr-x
git-fsck	2.27 MB	-rwxr-xr-x
git-fsck-objects	2.27 MB	-rwxr-xr-x
git-gc	2.27 MB	-rwxr-xr-x
git-get-tar-commit-id	2.27 MB	-rwxr-xr-x
git-grep	2.27 MB	-rwxr-xr-x
git-hash-object	2.27 MB	-rwxr-xr-x
git-help	2.27 MB	-rwxr-xr-x
git-http-backend	1.27 MB	-rwxr-xr-x
git-http-fetch	1.31 MB	-rwxr-xr-x
git-http-push	1.32 MB	-rwxr-xr-x
git-imap-send	1.32 MB	-rwxr-xr-x
git-index-pack	2.27 MB	-rwxr-xr-x
git-init	2.27 MB	-rwxr-xr-x
git-init-db	2.27 MB	-rwxr-xr-x
git-instaweb	18.11 KB	-rwxr-xr-x
git-interpret-trailers	2.27 MB	-rwxr-xr-x
git-log	2.27 MB	-rwxr-xr-x
git-ls-files	2.27 MB	-rwxr-xr-x
git-ls-remote	2.27 MB	-rwxr-xr-x
git-ls-tree	2.27 MB	-rwxr-xr-x
git-mailinfo	2.27 MB	-rwxr-xr-x
git-mailsplit	2.27 MB	-rwxr-xr-x
git-merge	2.27 MB	-rwxr-xr-x
git-merge-base	2.27 MB	-rwxr-xr-x
git-merge-file	2.27 MB	-rwxr-xr-x
git-merge-index	2.27 MB	-rwxr-xr-x
git-merge-octopus	2.42 KB	-rwxr-xr-x
git-merge-one-file	3.62 KB	-rwxr-xr-x
git-merge-ours	2.27 MB	-rwxr-xr-x
git-merge-recursive	2.27 MB	-rwxr-xr-x
git-merge-resolve	944 B	-rwxr-xr-x
git-merge-subtree	2.27 MB	-rwxr-xr-x
git-merge-tree	2.27 MB	-rwxr-xr-x
git-mergetool	10.06 KB	-rwxr-xr-x
git-mergetool--lib	8.66 KB	-rw-r--r--
git-mktag	2.27 MB	-rwxr-xr-x
git-mktree	2.27 MB	-rwxr-xr-x
git-mv	2.27 MB	-rwxr-xr-x
git-name-rev	2.27 MB	-rwxr-xr-x
git-notes	2.27 MB	-rwxr-xr-x
git-pack-objects	2.27 MB	-rwxr-xr-x
git-pack-redundant	2.27 MB	-rwxr-xr-x
git-pack-refs	2.27 MB	-rwxr-xr-x
git-parse-remote	2.59 KB	-rw-r--r--
git-patch-id	2.27 MB	-rwxr-xr-x
git-prune	2.27 MB	-rwxr-xr-x
git-prune-packed	2.27 MB	-rwxr-xr-x
git-pull	2.27 MB	-rwxr-xr-x
git-push	2.27 MB	-rwxr-xr-x
git-quiltimport	3.51 KB	-rwxr-xr-x
git-read-tree	2.27 MB	-rwxr-xr-x
git-rebase	16.89 KB	-rwxr-xr-x
git-rebase--am	2.62 KB	-rw-r--r--
git-rebase--helper	2.27 MB	-rwxr-xr-x
git-rebase--interactive	28.25 KB	-rw-r--r--
git-rebase--merge	4 KB	-rw-r--r--
git-receive-pack	2.27 MB	-rwxr-xr-x
git-reflog	2.27 MB	-rwxr-xr-x
git-remote	2.27 MB	-rwxr-xr-x
git-remote-ext	2.27 MB	-rwxr-xr-x
git-remote-fd	2.27 MB	-rwxr-xr-x
git-remote-ftp	1.32 MB	-rwxr-xr-x
git-remote-ftps	1.32 MB	-rwxr-xr-x
git-remote-http	1.32 MB	-rwxr-xr-x
git-remote-https	1.32 MB	-rwxr-xr-x
git-remote-testsvn	1.28 MB	-rwxr-xr-x
git-repack	2.27 MB	-rwxr-xr-x
git-replace	2.27 MB	-rwxr-xr-x
git-request-pull	3.61 KB	-rwxr-xr-x
git-rerere	2.27 MB	-rwxr-xr-x
git-reset	2.27 MB	-rwxr-xr-x
git-rev-list	2.27 MB	-rwxr-xr-x
git-rev-parse	2.27 MB	-rwxr-xr-x
git-revert	2.27 MB	-rwxr-xr-x
git-rm	2.27 MB	-rwxr-xr-x
git-send-pack	2.27 MB	-rwxr-xr-x
git-sh-i18n	2.3 KB	-rw-r--r--
git-sh-i18n--envsubst	1.26 MB	-rwxr-xr-x
git-sh-prompt	16 KB	-rw-r--r--
git-sh-setup	9.04 KB	-rw-r--r--
git-shell	1.26 MB	-rwxr-xr-x
git-shortlog	2.27 MB	-rwxr-xr-x
git-show	2.27 MB	-rwxr-xr-x
git-show-branch	2.27 MB	-rwxr-xr-x
git-show-index	1.26 MB	-rwxr-xr-x
git-show-ref	2.27 MB	-rwxr-xr-x
git-stage	2.27 MB	-rwxr-xr-x
git-stash	15.12 KB	-rwxr-xr-x
git-status	2.27 MB	-rwxr-xr-x
git-stripspace	2.27 MB	-rwxr-xr-x
git-submodule	23.38 KB	-rwxr-xr-x
git-submodule--helper	2.27 MB	-rwxr-xr-x
git-subtree	16.11 KB	-rwxr-xr-x
git-symbolic-ref	2.27 MB	-rwxr-xr-x
git-tag	2.27 MB	-rwxr-xr-x
git-unpack-file	2.27 MB	-rwxr-xr-x
git-unpack-objects	2.27 MB	-rwxr-xr-x
git-update-index	2.27 MB	-rwxr-xr-x
git-update-ref	2.27 MB	-rwxr-xr-x
git-update-server-info	2.27 MB	-rwxr-xr-x
git-upload-archive	2.27 MB	-rwxr-xr-x
git-upload-pack	1.27 MB	-rwxr-xr-x
git-var	2.27 MB	-rwxr-xr-x
git-verify-commit	2.27 MB	-rwxr-xr-x
git-verify-pack	2.27 MB	-rwxr-xr-x
git-verify-tag	2.27 MB	-rwxr-xr-x
git-web--browse	4.3 KB	-rwxr-xr-x
git-whatchanged	2.27 MB	-rwxr-xr-x
git-worktree	2.27 MB	-rwxr-xr-x
git-write-tree	2.27 MB	-rwxr-xr-x

Name

Size

Permission

Action

mergetools

[ DIR ]

drwxr-xr-x

git

2.27 MB

-rwxr-xr-x

git-add

2.27 MB

-rwxr-xr-x

git-add--interactive

42.89 KB

-rwxr-xr-x

git-am

2.27 MB

-rwxr-xr-x

git-annotate

2.27 MB

-rwxr-xr-x

git-apply

2.27 MB

-rwxr-xr-x

git-archive

2.27 MB

-rwxr-xr-x

git-bisect

14.11 KB

-rwxr-xr-x

git-bisect--helper

2.27 MB

-rwxr-xr-x

git-blame

2.27 MB

-rwxr-xr-x

git-branch

2.27 MB

-rwxr-xr-x

git-bundle

2.27 MB

-rwxr-xr-x

git-cat-file

2.27 MB

-rwxr-xr-x

git-check-attr

2.27 MB

-rwxr-xr-x

git-check-ignore

2.27 MB

-rwxr-xr-x

git-check-mailmap

2.27 MB

-rwxr-xr-x

git-check-ref-format

2.27 MB

-rwxr-xr-x

git-checkout

2.27 MB

-rwxr-xr-x

git-checkout-index

2.27 MB

-rwxr-xr-x

git-cherry

2.27 MB

-rwxr-xr-x

git-cherry-pick

2.27 MB

-rwxr-xr-x

git-clean

2.27 MB

-rwxr-xr-x

git-clone

2.27 MB

-rwxr-xr-x

git-column

2.27 MB

-rwxr-xr-x

git-commit

2.27 MB

-rwxr-xr-x

git-commit-tree

2.27 MB

-rwxr-xr-x

git-config

2.27 MB

-rwxr-xr-x

git-count-objects

2.27 MB

-rwxr-xr-x

git-credential

2.27 MB

-rwxr-xr-x

git-credential-cache

1.26 MB

-rwxr-xr-x

git-credential-cache--daemon

1.27 MB

-rwxr-xr-x

git-credential-store

1.27 MB

-rwxr-xr-x

git-daemon

1.28 MB

-rwxr-xr-x

git-describe

2.27 MB

-rwxr-xr-x

git-diff

2.27 MB

-rwxr-xr-x

git-diff-files

2.27 MB

-rwxr-xr-x

git-diff-index

2.27 MB

-rwxr-xr-x

git-diff-tree

2.27 MB

-rwxr-xr-x

git-difftool

2.27 MB

-rwxr-xr-x

git-difftool--helper

2.19 KB

-rwxr-xr-x

git-fast-export

2.27 MB

-rwxr-xr-x

git-fast-import

1.3 MB

-rwxr-xr-x

git-fetch

2.27 MB

-rwxr-xr-x

git-fetch-pack

2.27 MB

-rwxr-xr-x

git-filter-branch

15.17 KB

-rwxr-xr-x

git-fmt-merge-msg

2.27 MB

-rwxr-xr-x

git-for-each-ref

2.27 MB

-rwxr-xr-x

git-format-patch

2.27 MB

-rwxr-xr-x

git-fsck

2.27 MB

-rwxr-xr-x

git-fsck-objects

2.27 MB

-rwxr-xr-x

git-gc

2.27 MB

-rwxr-xr-x

git-get-tar-commit-id

2.27 MB

-rwxr-xr-x

git-grep

2.27 MB

-rwxr-xr-x

git-hash-object

2.27 MB

-rwxr-xr-x

git-help

2.27 MB

-rwxr-xr-x

git-http-backend

1.27 MB

-rwxr-xr-x

git-http-fetch

1.31 MB

-rwxr-xr-x

git-http-push

1.32 MB

-rwxr-xr-x

git-imap-send

1.32 MB

-rwxr-xr-x

git-index-pack

2.27 MB

-rwxr-xr-x

git-init

2.27 MB

-rwxr-xr-x

git-init-db

2.27 MB

-rwxr-xr-x

git-instaweb

18.11 KB

-rwxr-xr-x

git-interpret-trailers

2.27 MB

-rwxr-xr-x

git-log

2.27 MB

-rwxr-xr-x

git-ls-files

2.27 MB

-rwxr-xr-x

git-ls-remote

2.27 MB

-rwxr-xr-x

git-ls-tree

2.27 MB

-rwxr-xr-x

git-mailinfo

2.27 MB

-rwxr-xr-x

git-mailsplit

2.27 MB

-rwxr-xr-x

git-merge

2.27 MB

-rwxr-xr-x

git-merge-base

2.27 MB

-rwxr-xr-x

git-merge-file

2.27 MB

-rwxr-xr-x

git-merge-index

2.27 MB

-rwxr-xr-x

git-merge-octopus

2.42 KB

-rwxr-xr-x

git-merge-one-file

3.62 KB

-rwxr-xr-x

git-merge-ours

2.27 MB

-rwxr-xr-x

git-merge-recursive

2.27 MB

-rwxr-xr-x

git-merge-resolve

944 B

-rwxr-xr-x

git-merge-subtree

2.27 MB

-rwxr-xr-x

git-merge-tree

2.27 MB

-rwxr-xr-x

git-mergetool

10.06 KB

-rwxr-xr-x

git-mergetool--lib

8.66 KB

-rw-r--r--

git-mktag

2.27 MB

-rwxr-xr-x

git-mktree

2.27 MB

-rwxr-xr-x

git-mv

2.27 MB

-rwxr-xr-x

git-name-rev

2.27 MB

-rwxr-xr-x

git-notes

2.27 MB

-rwxr-xr-x

git-pack-objects

2.27 MB

-rwxr-xr-x

git-pack-redundant

2.27 MB

-rwxr-xr-x

git-pack-refs

2.27 MB

-rwxr-xr-x

git-parse-remote

2.59 KB

-rw-r--r--

git-patch-id

2.27 MB

-rwxr-xr-x

git-prune

2.27 MB

-rwxr-xr-x

git-prune-packed

2.27 MB

-rwxr-xr-x

git-pull

2.27 MB

-rwxr-xr-x

git-push

2.27 MB

-rwxr-xr-x

git-quiltimport

3.51 KB

-rwxr-xr-x

git-read-tree

2.27 MB

-rwxr-xr-x

git-rebase

16.89 KB

-rwxr-xr-x

git-rebase--am

2.62 KB

-rw-r--r--

git-rebase--helper

2.27 MB

-rwxr-xr-x

git-rebase--interactive

28.25 KB

-rw-r--r--

git-rebase--merge

4 KB

-rw-r--r--

git-receive-pack

2.27 MB

-rwxr-xr-x

git-reflog

2.27 MB

-rwxr-xr-x

git-remote

2.27 MB

-rwxr-xr-x

git-remote-ext

2.27 MB

-rwxr-xr-x

git-remote-fd

2.27 MB

-rwxr-xr-x

git-remote-ftp

1.32 MB

-rwxr-xr-x

git-remote-ftps

1.32 MB

-rwxr-xr-x

git-remote-http

1.32 MB

-rwxr-xr-x

git-remote-https

1.32 MB

-rwxr-xr-x

git-remote-testsvn

1.28 MB

-rwxr-xr-x

git-repack

2.27 MB

-rwxr-xr-x

git-replace

2.27 MB

-rwxr-xr-x

git-request-pull

3.61 KB

-rwxr-xr-x

git-rerere

2.27 MB

-rwxr-xr-x

git-reset

2.27 MB

-rwxr-xr-x

git-rev-list

2.27 MB

-rwxr-xr-x

git-rev-parse

2.27 MB

-rwxr-xr-x

git-revert

2.27 MB

-rwxr-xr-x

git-rm

2.27 MB

-rwxr-xr-x

git-send-pack

2.27 MB

-rwxr-xr-x

git-sh-i18n

2.3 KB

-rw-r--r--

git-sh-i18n--envsubst

1.26 MB

-rwxr-xr-x

git-sh-prompt

16 KB

-rw-r--r--

git-sh-setup

9.04 KB

-rw-r--r--

git-shell

1.26 MB

-rwxr-xr-x

git-shortlog

2.27 MB

-rwxr-xr-x

git-show

2.27 MB

-rwxr-xr-x

git-show-branch

2.27 MB

-rwxr-xr-x

git-show-index

1.26 MB

-rwxr-xr-x

git-show-ref

2.27 MB

-rwxr-xr-x

git-stage

2.27 MB

-rwxr-xr-x

git-stash

15.12 KB

-rwxr-xr-x

git-status

2.27 MB

-rwxr-xr-x

git-stripspace

2.27 MB

-rwxr-xr-x

git-submodule

23.38 KB

-rwxr-xr-x

git-submodule--helper

2.27 MB

-rwxr-xr-x

git-subtree

16.11 KB

-rwxr-xr-x

git-symbolic-ref

2.27 MB

-rwxr-xr-x

git-tag

2.27 MB

-rwxr-xr-x

git-unpack-file

2.27 MB

-rwxr-xr-x

git-unpack-objects

2.27 MB

-rwxr-xr-x

git-update-index

2.27 MB

-rwxr-xr-x

git-update-ref

2.27 MB

-rwxr-xr-x

git-update-server-info

2.27 MB

-rwxr-xr-x

git-upload-archive

2.27 MB

-rwxr-xr-x

git-upload-pack

1.27 MB

-rwxr-xr-x

git-var

2.27 MB

-rwxr-xr-x

git-verify-commit

2.27 MB

-rwxr-xr-x

git-verify-pack

2.27 MB

-rwxr-xr-x

git-verify-tag

2.27 MB

-rwxr-xr-x

git-web--browse

4.3 KB

-rwxr-xr-x

git-whatchanged

2.27 MB

-rwxr-xr-x

git-worktree

2.27 MB

-rwxr-xr-x

git-write-tree

2.27 MB

-rwxr-xr-x

Code Editor : git-rebase--merge

# This shell script fragment is sourced by git-rebase to implement
# its merge-based non-interactive mode that copes well with renamed
# files.
#
# Copyright (c) 2010 Junio C Hamano.
#

prec=4

read_state () {
	onto_name=$(cat "$state_dir"/onto_name) &&
	end=$(cat "$state_dir"/end) &&
	msgnum=$(cat "$state_dir"/msgnum)
}

continue_merge () {
	test -d "$state_dir" || die "$state_dir directory does not exist"

unmerged=$(git ls-files -u)
	if test -n "$unmerged"
	then
		echo "You still have unmerged paths in your index"
		echo "did you forget to use git add?"
		die "$resolvemsg"
	fi

cmt=$(cat "$state_dir/current")
	if ! git diff-index --quiet --ignore-submodules HEAD --
	then
		if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message \
			--no-verify -C "$cmt"
		then
			echo "Commit failed, please do not call \"git commit\""
			echo "directly, but instead do one of the following: "
			die "$resolvemsg"
		fi
		if test -z "$GIT_QUIET"
		then
			printf "Committed: %0${prec}d " $msgnum
		fi
		echo "$cmt $(git rev-parse HEAD^0)" >> "$state_dir/rewritten"
	else
		if test -z "$GIT_QUIET"
		then
			printf "Already applied: %0${prec}d " $msgnum
		fi
	fi
	test -z "$GIT_QUIET" &&
	GIT_PAGER='' git log --format=%s -1 "$cmt"

# onto the next patch:
	msgnum=$(($msgnum + 1))
	echo "$msgnum" >"$state_dir/msgnum"
}

call_merge () {
	msgnum="$1"
	echo "$msgnum" >"$state_dir/msgnum"
	cmt="$(cat "$state_dir/cmt.$msgnum")"
	echo "$cmt" > "$state_dir/current"
	git update-ref REBASE_HEAD "$cmt"
	hd=$(git rev-parse --verify HEAD)
	cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
	eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
	eval GITHEAD_$hd='$onto_name'
	export GITHEAD_$cmt GITHEAD_$hd
	if test -n "$GIT_QUIET"
	then
		GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
	fi
	test -z "$strategy" && strategy=recursive
	# If cmt doesn't have a parent, don't include it as a base
	base=$(git rev-parse --verify --quiet $cmt^)
	eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
	rv=$?
	case "$rv" in
	0)
		unset GITHEAD_$cmt GITHEAD_$hd
		return
		;;
	1)
		git rerere $allow_rerere_autoupdate
		die "$resolvemsg"
		;;
	2)
		echo "Strategy: $strategy failed, try another" 1>&2
		die "$resolvemsg"
		;;
	*)
		die "Unknown exit code ($rv) from command:" \
			"git-merge-$strategy $cmt^ -- HEAD $cmt"
		;;
	esac
}

finish_rb_merge () {
	move_to_original_branch
	if test -s "$state_dir"/rewritten
	then
		git notes copy --for-rewrite=rebase <"$state_dir"/rewritten
		hook="$(git rev-parse --git-path hooks/post-rewrite)"
		test -x "$hook" && "$hook" rebase <"$state_dir"/rewritten
	fi
	say All done.
}

# The whole contents of this file is run by dot-sourcing it from
# inside a shell function.  It used to be that "return"s we see
# below were not inside any function, and expected to return
# to the function that dot-sourced us.
#
# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
# construct and continue to run the statements that follow such a "return".
# As a work-around, we introduce an extra layer of a function
# here, and immediately call it after defining it.
git_rebase__merge () {

case "$action" in
continue)
	read_state
	continue_merge
	while test "$msgnum" -le "$end"
	do
		call_merge "$msgnum"
		continue_merge
	done
	finish_rb_merge
	return
	;;
skip)
	read_state
	git rerere clear
	msgnum=$(($msgnum + 1))
	while test "$msgnum" -le "$end"
	do
		call_merge "$msgnum"
		continue_merge
	done
	finish_rb_merge
	return
	;;
show-current-patch)
	exec git show REBASE_HEAD --
	;;
esac

mkdir -p "$state_dir"
echo "$onto_name" > "$state_dir/onto_name"
write_basic_state
rm -f "$(git rev-parse --git-path REBASE_HEAD)"

msgnum=0
for cmt in $(git rev-list --reverse --no-merges "$revisions")
do
	msgnum=$(($msgnum + 1))
	echo "$cmt" > "$state_dir/cmt.$msgnum"
done

echo 1 >"$state_dir/msgnum"
echo $msgnum >"$state_dir/end"

end=$msgnum
msgnum=1

while test "$msgnum" -le "$end"
do
	call_merge "$msgnum"
	continue_merge
done

finish_rb_merge

}
# ... and then we call the whole thing.
git_rebase__merge

${this.title}

Code Editor : git-rebase--merge