diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 10:46:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 10:46:32 +0900 |
| commit | 2d5792f0716605ff0059fe4b5c865d6821c0161e (patch) | |
| tree | f54d21723cf1216001ec9643f91f0d60136a8643 /submodule.h | |
| parent | 7547b95b4fbb8591726b1d9381c176cc27fc6aea (diff) | |
| parent | efdfe11f4f1f901db1ebfa7ebda6337293a2e5c5 (diff) | |
| download | git-2d5792f0716605ff0059fe4b5c865d6821c0161e.tar.gz | |
Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
* bw/c-plus-plus: (37 commits)
replace: rename 'new' variables
trailer: rename 'template' variables
tempfile: rename 'template' variables
wrapper: rename 'template' variables
environment: rename 'namespace' variables
diff: rename 'template' variables
environment: rename 'template' variables
init-db: rename 'template' variables
unpack-trees: rename 'new' variables
trailer: rename 'new' variables
submodule: rename 'new' variables
split-index: rename 'new' variables
remote: rename 'new' variables
ref-filter: rename 'new' variables
read-cache: rename 'new' variables
line-log: rename 'new' variables
imap-send: rename 'new' variables
http: rename 'new' variables
entry: rename 'new' variables
diffcore-delta: rename 'new' variables
...
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index b9b7ef0030..9589f13127 100644 --- a/submodule.h +++ b/submodule.h @@ -117,7 +117,7 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule); #define SUBMODULE_MOVE_HEAD_FORCE (1<<1) extern int submodule_move_head(const char *path, const char *old, - const char *new, + const char *new_head, unsigned flags); /* |