Skip to content

Commit

Permalink
strip trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Dieterbe committed Dec 1, 2010
1 parent ae41c79 commit f06e3cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion git-merge-changelog.c
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ conflict_write (FILE *fp, struct conflict *c)

/* Long options. */
static const struct option long_options[] =
{
{
{ "help", no_argument, NULL, 'h' },
{ "split-merged-entry", no_argument, NULL, CHAR_MAX + 1 },
{ "version", no_argument, NULL, 'V' },
Expand Down
8 changes: 4 additions & 4 deletions git-undo
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ cmd=$1
shift 1

case $cmd in
commit)
commit)
if [[ -z "$1" ]]; then
git reset --soft HEAD^
else
git revert "$@"
fi
;;

add|rm)
add|rm)
git reset --mixed "$@"
;;

changes)
changes)
git reset --hard HEAD
;;

change)
change)
git checkout -f -- "$@"
;;

Expand Down

0 comments on commit f06e3cc

Please sign in to comment.