直接贴代码
tf@ubuntu:~/projects/openwrt1407$ git pull
Updating 331ecb0..d12dc6e
error: Your local changes to the following files would be overwritten by merge:
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/config-3.10
target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
target/linux/ar71xx/image/Makefile
Please, commit your changes or stash them before you can merge.
Aborting
tf@ubuntu:~/projects/openwrt1407$ git stash *** Please tell me who you are. Run git config --global user.email "[email protected]"
git config --global user.name "Your Name" to set your account's default identity.
Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'tf@ubuntu.(none)')
Cannot save the current index state
tf@ubuntu:~/projects/openwrt1407$ git config --global user.email "[email protected]"
tf@ubuntu:~/projects/openwrt1407$ git config --global user.name "tf"
tf@ubuntu:~/projects/openwrt1407$ git stash
Saved working directory and index state WIP on master: 331ecb0 mac80211: fix HT mode selection for ad-hoc
HEAD is now at 331ecb0 mac80211: fix HT mode selection for ad-hoc
tf@ubuntu:~/projects/openwrt1407$ git pull
^[^AUpdating 331ecb0..d12dc6e
Fast-forward
package/libs/openssl/Makefile | +-
package/libs/openssl/patches/-no_engines.patch | +-
.../libs/openssl/patches/-parallel_build.patch | +-
package/libs/polarssl/Makefile | +-
.../polarssl/patches/-gen_key_config_fix.patch | ----
.../libs/polarssl/patches/-CVE--.patch | ++
package/network/config/qos-scripts/Makefile | +-
package/network/ipv6/map/Makefile | +-
package/network/ipv6/map/files/map.sh | +
package/network/ipv6/map/src/mapcalc.c | +-
package/network/services/openvpn/Makefile | +-
.../patches/-backport_cipher_none_fix.patch | ++++++
target/linux/ar71xx/base-files/etc/diag.sh | +
.../ar71xx/base-files/etc/uci-defaults/01_leds | ++
.../ar71xx/base-files/etc/uci-defaults/02_network | +
target/linux/ar71xx/base-files/lib/ar71xx.sh | +
.../ar71xx/base-files/lib/upgrade/platform.sh | +
target/linux/ar71xx/config-3.10 | +
.../ar71xx/files/arch/mips/ath79/mach-dragino2.c | +++--
.../files/arch/mips/ath79/mach-tl-wa701nd-v2.c | +++++++++++++
target/linux/ar71xx/image/Makefile | +-
.../patches-3.10/-MIPS-ath79-fix-restart.patch | ++
.../-MIPS-ath79-add-TL-WA701NDv2-support.patch | +++++
.../patches-3.10/-net_bridge_backports.patch | +++++++++++++++++----
.../-bridge_optimize_netfilter_hooks.patch | +-
tools/firmware-utils/src/mktplinkfw.c | +
files changed, insertions(+), deletions(-)
delete mode package/libs/polarssl/patches/-gen_key_config_fix.patch
create mode package/libs/polarssl/patches/-CVE--.patch
create mode package/network/services/openvpn/patches/-backport_cipher_none_fix.patch
create mode target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa701nd-v2.c
create mode target/linux/ar71xx/patches-3.10/-MIPS-ath79-add-TL-WA701NDv2-support.patch
tf@ubuntu:~/projects/openwrt1407$ git stash pop
Auto-merging target/linux/ar71xx/image/Makefile
Auto-merging target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
CONFLICT (content): Merge conflict in target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
Auto-merging target/linux/ar71xx/config-3.10
Auto-merging target/linux/ar71xx/base-files/lib/upgrade/platform.sh
Auto-merging target/linux/ar71xx/base-files/lib/ar71xx.sh
tf@ubuntu:~/projects/openwrt1407$