diff options
| author | Michael Forney <mforney@mforney.org> | 2017-02-25 10:11:37 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-02-25 10:23:59 -0800 |
| commit | 2ffb8bfc373bca335f99debebeafe8cf48381063 (patch) | |
| tree | f5f045ffe22087abad4c0e10646ab9334c33d099 /pkg/git/patch | |
| parent | 63dd42153bf8123c7c36bee0fe0e2b442631e9b5 (diff) | |
git: Update to 2.12.0
Diffstat (limited to 'pkg/git/patch')
| -rw-r--r-- | pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch index 717f8b13..d8cc85d9 100644 --- a/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch +++ b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch @@ -1,4 +1,4 @@ -From b8d3b9e40f00194a25797f606aeebf946b38eba2 Mon Sep 17 00:00:00 2001 +From 11e58a3bbbc2c266ea6c3d3a6bd05c860b56ecbc Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 3 Dec 2016 00:41:41 -0800 Subject: [PATCH] Drop dashes from builtin invocations in scripts @@ -12,7 +12,7 @@ Subject: [PATCH] Drop dashes from builtin invocations in scripts 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh -index bcf0d92..6c390d6 100755 +index bcf0d92ec..6c390d6c2 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -100,7 +100,7 @@ do @@ -25,7 +25,7 @@ index bcf0d92..6c390d6 100755 next=$(git write-tree 2>/dev/null) fi diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh -index 424b034..9879c59 100755 +index 424b034e3..9879c5939 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in @@ -50,7 +50,7 @@ index 424b034..9879c59 100755 esac diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh -index c9da747..343fe7b 100755 +index c9da747fc..343fe7bcc 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -45,7 +45,7 @@ then @@ -63,7 +63,7 @@ index c9da747..343fe7b 100755 exit 0 else diff --git a/git-parse-remote.sh b/git-parse-remote.sh -index d3c3998..dcfa271 100644 +index d3c39980f..dcfa27177 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -2,7 +2,7 @@ @@ -76,10 +76,10 @@ index d3c3998..dcfa271 100644 GIT_DIR=$(git rev-parse -q --git-dir) || :; diff --git a/git-submodule.sh b/git-submodule.sh -index a024a13..4aac71f 100755 +index 136e26a2c..abcb03a0c 100755 --- a/git-submodule.sh +++ b/git-submodule.sh -@@ -843,7 +843,7 @@ cmd_summary() { +@@ -849,7 +849,7 @@ cmd_summary() { test $status != A && test $ignore_config = all && continue fi # Also show added or modified modules which are checked out @@ -88,7 +88,7 @@ index a024a13..4aac71f 100755 printf '%s\n' "$sm_path" done ) -@@ -877,11 +877,11 @@ cmd_summary() { +@@ -883,11 +883,11 @@ cmd_summary() { missing_dst= test $mod_src = 160000 && @@ -103,5 +103,5 @@ index a024a13..4aac71f 100755 display_name=$(git submodule--helper relative-path "$name" "$wt_prefix") -- -2.10.2 +2.11.1 |