diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 10:31:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 07:50:28 +0100 |
| commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
| tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /Documentation/howto/update-hook-example.txt | |
| parent | GIT 1.6.5 (diff) | |
| download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.xz git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.zip | |
Use 'fast-forward' all over the place
It's a compound word.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/update-hook-example.txt')
| -rw-r--r-- | Documentation/howto/update-hook-example.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt index 697d918885..b7f8d416d6 100644 --- a/Documentation/howto/update-hook-example.txt +++ b/Documentation/howto/update-hook-example.txt @@ -76,7 +76,7 @@ case "$1" in if expr "$2" : '0*$' >/dev/null; then info "The branch '$1' is new..." else - # updating -- make sure it is a fast forward + # updating -- make sure it is a fast-forward mb=$(git-merge-base "$2" "$3") case "$mb,$2" in "$2,$mb") info "Update is fast-forward" ;; |