diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-25 11:18:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-25 11:18:32 -0800 |
| commit | d0038f4b31d6ab1f0602a4d3c19e35c5004175fa (patch) | |
| tree | 2b67cde99b211b34335e838515690896794c6d75 /Makefile | |
| parent | The sixth batch for 2.26 (diff) | |
| parent | remote rename/remove: gently handle remote.pushDefault config (diff) | |
| download | tgif-d0038f4b31d6ab1f0602a4d3c19e35c5004175fa.tar.xz | |
Merge branch 'bw/remote-rename-update-config'
"git remote rename X Y" needs to adjust configuration variables
(e.g. branch.<name>.remote) whose value used to be X to Y.
branch.<name>.pushRemote is now also updated.
* bw/remote-rename-update-config:
remote rename/remove: gently handle remote.pushDefault config
config: provide access to the current line number
remote rename/remove: handle branch.<name>.pushRemote config values
remote: clean-up config callback
remote: clean-up by returning early to avoid one indentation
pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -955,6 +955,7 @@ LIB_OBJS += quote.o LIB_OBJS += range-diff.o LIB_OBJS += reachable.o LIB_OBJS += read-cache.o +LIB_OBJS += rebase.o LIB_OBJS += rebase-interactive.o LIB_OBJS += reflog-walk.o LIB_OBJS += refs.o |