delta/git.git/git-revert.sh, branch ws/curl-http-proxy-over-https

Make git-revert & git-cherry-pick a builtin

2007-03-04T06:59:34+00:00

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

honor GIT_REFLOG_ACTION in git-commit

2007-02-03T23:17:49+00:00

This allows git-cherry-pick and git-revert to properly identify
themselves in the resulting reflog entries.  Earlier they were
recorded as what git-commit has done.

Signed-off-by: Junio C Hamano

[PATCH] Rename git-repo-config to git-config.

2007-01-29T00:16:53+00:00

Signed-off-by: Tom Prince 
Signed-off-by: Junio C Hamano

Use nice names in conflict markers during cherry-pick/revert.

2007-01-15T07:17:32+00:00

Always call the current HEAD 'HEAD', and name the patch being
cherry-picked or reverted by its oneline subject rather than
its SHA1.  This matches git am's behavior and is done because
users most commonly are cherry-picking by SHA1 rather than by
ref name.

Signed-off-by: Shawn O. Pearce 
Signed-off-by: Junio C Hamano

Use merge-recursive in git-revert/git-cherry-pick

2007-01-15T06:00:34+00:00

This makes revert and cherry-pick to use merge-recursive, to
allow them to notice renames.  A pair of test scripts
demonstrate that an old change before a rename happened can be
applied (reverted) after a rename with cherry-pick (with revert).

Signed-off-by: Junio C Hamano

Merge branch 'jc/int'

2007-01-14T20:04:25+00:00

* jc/int:
  More tests in t3901.
  Consistent message encoding while reusing log from an existing commit.
  t3901: test "format-patch | am" pipe with i18n
  Use log output encoding in --pretty=email headers.

Consistent message encoding while reusing log from an existing commit.

2007-01-13T21:33:07+00:00

The following commands can reuse log message from an existing
commit while creating a new commit:

	git-cherry-pick
	git-rebase (both with and without --merge)
	git-commit (-c and -C)

When the original commit was made in a different encoding from
the current i18n.commitencoding, "cat-file commit" would give a
string that is inconsistent with what the resulting commit will
claim to be in.  Replace them with "git show -s --encoding".

"git-rebase" without --merge is "git format-patch" piped to "git
am" in essence, and has been taken care of before this commit.

Signed-off-by: Junio C Hamano

Allow whole-tree operations to be started from a subdirectory

2007-01-13T00:54:38+00:00

This updates five commands (merge, pull, rebase, revert and cherry-pick)
so that they can be started from a subdirectory.

This may not actually be what we want to do.  These commands are
inherently whole-tree operations, and an inexperienced user may
mistakenly expect a "git pull" from a subdirectory would merge
only the subdirectory the command started from.

Signed-off-by: Junio C Hamano

git-revert: Fix die before git-sh-setup defines it.

2007-01-12T08:13:34+00:00

The code previously checked it's own name and called 'die' upon
an error.  However 'die' was not yet defined because git-sh-setup
had not been sourced yet.  Instead simply write the error message
to stderr and exit with an error as was originally desired.

Signed-off-by: Bob Proulx 
Signed-off-by: Junio C Hamano

Disallow working directory commands in a bare repository.

2007-01-10T23:03:09+00:00

If the user tries to run a porcelainish command which requires
a working directory in a bare repository they may get unexpected
results which are difficult to predict and may differ from command
to command.

Instead we should detect that the current repository is a bare
repository and refuse to run the command there, as there is no
working directory associated with it.

[jc: updated Shawn's original somewhat -- bugs are mine.]

Signed-off-by: Shawn O. Pearce 
Signed-off-by: Junio C Hamano