lucwastiaux
01e750a372
couple of changes to the shell layer
8 years ago
Xyverz
b8b2a55973
Merge remote-tracking branch 'upstream/master'
8 years ago
lucwastiaux
072237bce8
introduce shell_layer
8 years ago
lucwastiaux
1ac15e6b3a
put shell nav under tab, introduce an OSL for the brackets layer
8 years ago
Jack Humbert
99d0b54e5e
Merge pull request #999 from deadcyclo/master
...
Adds layer images to the deadcyclo layout readme
8 years ago
Jack Humbert
a896b300ec
Merge pull request #1007 from bryan4887/bryan
...
Added Bryan's keymap
8 years ago
Bryan Hernandez
aa0939b5ef
Added Bryan's keymap
8 years ago
Brendan Johan Lee
c4fca8b6bc
Fixed incorrect layer image in deadcyclo readme
8 years ago
Brendan Johan Lee
1121753746
Merge remote-tracking branch 'upstream/master'
8 years ago
Brendan Johan Lee
db1aec159d
Added layer images to deadcyclo layout readme
8 years ago
xyverz
99521a4482
Merge remote-tracking branch 'upstream/master'
8 years ago
Joshua T
8f8d104759
Merged from upstream
8 years ago
Joshua T
5ce7ec9ea5
Increased TAPPING_TERM to 200
8 years ago
Joshua T
6fba925f41
Fixed key not matching its diagram
8 years ago
ishigoya
402e6c13a1
new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png
...
new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png
new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png
modified: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
new file: keyboards/ergodox/keymaps/ishigoya-jp/readme.md
8 years ago
ishigoya
0bd03d698c
new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
8 years ago
Jack Humbert
e5c7b5d8fc
Merge pull request #983 from common-nighthawk/master
...
adds personal keymap for ergodox optimized for macOS with Vim
8 years ago
Brendan Johan Lee
a85aefd27a
fix version macro making layer 3 sticky on deadcyclo layout
8 years ago
Brendan Johan Lee
b23a963bec
Added the deadcyclo layout
8 years ago
Jack Humbert
ffc1d97672
Update config.h
8 years ago
Daniel
0de3a5d0b2
reverts change outside of personal keymap.
8 years ago
Daniel
acffbb480f
adds dedicated double-quote key.
8 years ago
Gergely Nagy
eb588d630c
ergodox: Update algernon's keymap to v1.10
...
Miscellaneous
=============
* `µ` can now be entered with UCIS.
* `™` can now be entered with UCIS.
Tools
=====
* `tools/hid-commands` can now find Banshee, and prefers it over Kodi.
* `tools/hid-commands` can now find Chrome too, not juts Chromium.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Erez Zukerman
9675e1357f
Update readme.md
8 years ago
Erez Zukerman
a81279158b
Update readme.md
8 years ago
Erez Zukerman
4e4f365c87
updates readme
8 years ago
Erez Zukerman
10864def46
New default firmware graphic
8 years ago
Jack Humbert
101416eb82
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
8 years ago
Jack Humbert
06c64bbff3
rgb clean-up, api clean-up
8 years ago
Erez Zukerman
29731588b7
Flips off MIDI and API_SYSEX
8 years ago
Jack Humbert
8e28bf39d8
Merge pull request #958 from pvinis/master
...
make a sysctl MO button so i can quickly use the arrows
8 years ago
Erez Zukerman
8a65c640ec
Adds a troubleshooting layout for resetting the EEPROM
8 years ago
Erez Zukerman
df32d5b769
Removes alt/j dual function
8 years ago
Pavlos Vinieratos
34d6f07d2c
make a sysctl MO button so i can quickly use the arrows
8 years ago
Jack Humbert
803040d4ee
Merge pull request #952 from pvinis/master
...
update my keymap a bit
8 years ago
Kyle Smith
83e613ad23
Allow power consumption to be set per-keyboard.
8 years ago
lucwastiaux
ebe351a690
enable brackets using the - key on the right, and cleanups
8 years ago
xyverz
0523657923
Merge remote-tracking branch 'upstream/master'
8 years ago
lucwastiaux
75d7eb9cb5
put home/end on thumb cluster
8 years ago
lucwastiaux
a3c8949627
readme updates
8 years ago
lucwastiaux
9240f27ba9
Merge remote-tracking branch 'upstream/master'
8 years ago
lucwastiaux
dc4c8875ba
use thumb cluster key to toggle brackets layer
8 years ago
Pavlos Vinieratos
9a59fee667
tap dance for some layers. one tap sysctl, two taps mouse.
8 years ago
Pavlos Vinieratos
063ade6bb5
add light for some layers
8 years ago
Pavlos Vinieratos
be2863e56d
separate sysctl and mouse layers
8 years ago
Pavlos Vinieratos
d5914a4dfe
add alt key
8 years ago
Pavlos Vinieratos
5d241479f5
media keys
8 years ago
xyverz
9216bc7377
Merge remote-tracking branch 'upstream/master'
8 years ago
Daniel
1f52dbcac0
removes double-tab brackets and adds back quot to left cmd.
8 years ago
Erez Zukerman
82922a4937
A new default layout that supports Shine
8 years ago
Erez Zukerman
a05b6a72d9
Adjusts config for better mousekey support
8 years ago
Erez Zukerman
aa70aa3962
Tweaks Kristian's layout again
8 years ago
Erez Zukerman
5d43a2aecf
Kristian's keymap
8 years ago
Erez Zukerman
66b13a66e9
Better layout
8 years ago
Erez Zukerman
4094544d41
Test layout for ErgoDox EZ manufacturing robot
8 years ago
Erez Zukerman
51ae6da99e
Merge pull request #918 from jackhumbert/wu5y7
...
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
8 years ago
Jack Humbert
f946d830f9
guess i didnt pull
8 years ago
Jack Humbert
efbc205efd
Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7
8 years ago
Jack Humbert
d0cefef946
enable rgblight by default for ez
8 years ago
Jack Humbert
06f18e95d4
enable api sysex for ez
8 years ago
Olivier
5a2501d90f
Add the AZERTY compatibility layer.
8 years ago
Olivier
f02eccbb29
Change layer names (cosmetic change) and reorder them so that the "shift" layer can be accessed from the "alt" layer when in QWERTY compat mode.
8 years ago
Erez Zukerman
84735836e3
Tweaks position of TOG not to conflict with MO
8 years ago
Olivier
d2b6438e39
A little cleanup, add some comments, change others.
8 years ago
Erez Zukerman
9caf866618
Tweaks EZ Makefile
8 years ago
Erez Zukerman
2d0ada0190
Pulls LED config into common config for EZ
8 years ago
Olivier
3f1fca2eb8
Adjust comment.
8 years ago
Olivier
e26a80508f
Reorganize the numeric keypad layer more like a traditional numeric keypad.
8 years ago
Olivier
d6d0b7eada
Merge https://github.com/jackhumbert/qmk_firmware
8 years ago
Daniel
a94eb16bd7
removes the double actions from the metakeys.
8 years ago
Jack Humbert
7edac212c8
separated into api files/folder
8 years ago
Jack Humbert
f25596b8dc
rgblight fixes
8 years ago
Jack Humbert
cefa8468fb
travis pls
8 years ago
Jack Humbert
450a8fb5b6
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
8 years ago
Jack Humbert
06a2677b7e
fix infinity
8 years ago
Jack Humbert
af119baf71
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
...
Ergodox dvorak emacs
8 years ago
Jack Humbert
be265decae
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
...
Always initialize the Infinity Ergodox backlight
8 years ago
Jack Humbert
27ebacb15d
merging lets_split
8 years ago
Didier Chagniot
6f24344be7
typo fix
8 years ago
Fred Sundvik
c86bbf474e
Always initialze the Infinity Ergodox backlight
...
Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.
8 years ago
samgalson@gmail.com
7f5e71d79f
adds galson keymap
8 years ago
Jack Humbert
ab6557c1a0
wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7
8 years ago
Jack Humbert
161bd5596b
midi back and forth
8 years ago
Daniel
abee809298
moves brackets to top row.
8 years ago
Erez Zukerman
285c5a91f2
Groundwork for dedicated color keycodes
8 years ago
Erez Zukerman
9bbc9a7ce0
Initial Erez Experimental keymap tweaks
8 years ago
Jack Humbert
3774a7fcda
rgb light through midi
8 years ago
xyverz
b493f6a4ed
Merge remote-tracking branch 'upstream/master'
8 years ago
Seebs
4da698fda3
dvorak/plover keyboard layout
...
Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?
Signed-off-by: seebs <seebs@seebs.net>
8 years ago
Jack Humbert
9f1b27c5ba
Merge pull request #880 from psyill/master
...
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
8 years ago
Jack Humbert
e9f7487518
mostly working
8 years ago
Hans Ellegård
162f603b1c
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
8 years ago
Seth Chandler
34bf8558cd
update sethbc ergodox keymap
8 years ago
Jack Humbert
33e62c080c
merging
8 years ago
Jonathan Arnett
1d766c596e
Removed the control action when holding z or /
8 years ago
lucwastiaux
b8e204322a
added more shortcut keys
8 years ago
lucwastiaux
78a1dc84dd
updated readme
8 years ago
lucwastiaux
ff8b4a1d89
removed brackets anywhere but in brackets layer, added mouse layer back in, replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer
8 years ago
Erez Zukerman
d5270af111
Implements dedicated text zoom keys
8 years ago
Erez Zukerman
7a9be2562d
Merge pull request #851 from J3RN/momentary
...
Switched to momentary
8 years ago
Erez Zukerman
a6401076d5
Merge pull request #843 from lucwastiaux/master
...
Adding Ergodox Dvorak Programmer layout
8 years ago
Erez Zukerman
bd40844e4e
Merge pull request #836 from 20lives/master
...
added new layout
8 years ago
lucwastiaux
055247f35d
re-introduce brackets layer
8 years ago
Alpha Chen
427ea7a889
[alphadox] remove tmk reset code
8 years ago
Alpha Chen
e2916f8ab1
[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt
8 years ago
Alpha Chen
22cb73fad3
add alphadox layouts to atreus and ergodox
8 years ago
Lior Haim
0d26320cf3
merge upstream
8 years ago
lucwastiaux
919caaccb7
adding readme
8 years ago
lucwastiaux
14ac397d5d
add up/down keys on thumb clusters
8 years ago
lucwastiaux
64ac74cab6
remove brackets layer, replace a few shortcuts on thumb cluster
8 years ago
lucwastiaux
97e3106848
type brackets in symbol layer, using bottom row
8 years ago
lucwastiaux
e0c9ec54dd
add tap-dance support, make right shift double-tap=caplock
8 years ago
lucwastiaux
bc8092245c
change include files
8 years ago
lucwastiaux
53a2bf9215
added dvorak programmer layout
8 years ago
twentylives
8727976a1a
fixed copy-cut-paste buttons
8 years ago
Erez Zukerman
2e2b9962cd
Merge pull request #833 from h-parks/master
...
Win10 Writer's Block - An ErgoDox Keymap
8 years ago
twentylives
4ebbb3c297
Merge branch 'master' of https://github.com/20lives/qmk_firmware
8 years ago
twentylives
7090c99adf
fixed base layer = key
8 years ago
20lives
464af700eb
fix readme
8 years ago
twentylives
65c1127b49
update pics and readme
8 years ago
h-parks
f2197611c7
Win10 Writer's Block - An ErgoDox Keymap
...
fix for compiling on infinity:
replaced `_delay_ms()' with `wait_ms()'
included "wait.h"
8 years ago
h-parks
1688c014cc
Win10 Writer's Block - An ErgoDox Keymap
...
This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
8 years ago
Xyverz
f41d540e81
Add files via upload
...
Minor changes to my Dvorak keymap. Updated the readme.md to reflect these changes.
8 years ago
Ryan Ascheman
fad20756e3
update header file
8 years ago
Ryan Ascheman
cabfd78309
didn't read PR comment close enough, correcting folder
8 years ago
Ryan Ascheman
60326eded2
moving keymap to new location
8 years ago
20lives
48eb5112b5
Update readme.md
8 years ago
20lives
31193b9cff
Update readme.md
8 years ago
twentylives
28dfaa20f5
adding dvorak hebrew layout
8 years ago
Jack Humbert
04df74f636
Merge pull request #829 from r2d2rogers/master
...
Move hand_swap_config to ez.c, removes error for infinity
8 years ago
Rob Rogers
75ea142d01
Update ez.c
8 years ago
Rob Rogers
1dcee07eab
Move hand_swap_config to ez.c, removes error for infinity
8 years ago
Jack Humbert
5f91fb4136
working with power limit
8 years ago
Gergely Nagy
f9d8cf35f6
ergodox: Update algernon's keymap to v1.9
...
Overall changes
===============
* `F12` was replaced by an `Fx` key, that activate the **Media** layer
as a one-shot layer, and also `Alt` as a one-shot modifier.
Base layer changes
==================
* The `Media Stop` key is now a tap-dance key, and resets the device for
programming on the fourth tap.
Miscellaneous
=============
* `π` can now be entered with UCIS.
* `🐁 ` can now be entered with UCIS.
Tools
=====
* The `tools/layer-notify` tool was removed, it was an example, which I
don't use.
`tools/hid-commands`
--------------------
* Now looks at the `DISABLE_APPSEL_START` environment value, and does
not display an AppSel notification if it is non-empty.
* Will attempt to re-program the keyboard when receiving a `reflash`
command.
* No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes
for any Emacs.
* The `APPSEL_MUSIC` command now includes Kodi in the list too, as the
last choice.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Joshua T
896c1e6f1e
Added a bit more detail to header
8 years ago
Joshua T
a2adff94bb
Reversed tilde and grave
8 years ago
Joshua T
825563f34d
Moved Extend tab and ^tab
8 years ago
Joshua T
1455a44a44
Added = to match Atreus
8 years ago
Joshua T
80fe2ea676
Switched Tab and Ctrl back
8 years ago
Joshua T
0714981288
Fixed typo
8 years ago
Joshua T
c67f6ee872
Added Menu key (the rclick menu)
8 years ago
Joshua T
d9db5395b3
Updated layout to 1.2 - lots of changes
...
Rewrote QWERTY to make it a first-class citizen instead of just a glorified game layer.
Added a lot of keys to Extend layer to bring it in line with my Atreus.
Plenty of other changes too.
8 years ago
Joshua T
a9c8f2f5b8
Reduced TAPPING_TERM to 150
...
Also removed duplicate definition of PREVENT_STUCK_MODIFIERS
8 years ago
Joshua T
2e6a1a53d7
Merge remote-tracking branch 'upstream/master'
8 years ago
Erez Zukerman
0a9ad8f335
Merge pull request #818 from pvinis/pvinis-keymap
...
pvinis keymap
8 years ago
Jack & Erez
e27a754b70
[Jack & Erez] Simplifies and documents TO
8 years ago
Pavlos Vinieratos
0853227ede
add readme
8 years ago
Pavlos Vinieratos
538cdda78e
use wait_ms instead of _delay_ms
8 years ago
Pavlos Vinieratos
bcc0fa5c81
add messenger
8 years ago
Pavlos Vinieratos
2855de5f0f
init keymap
8 years ago
Erez Zukerman
698d02122b
Merge pull request #803 from coderkun/coderkun_neo2
...
Merge Unicode fixes for keymap “coderkun_neo2”
8 years ago
Nathan Johnson
e95c1e3f2c
Adding whiskey_tango_foxtrot_capslock ergodox keymap
8 years ago
Jonathan Arnett
f284bc6af9
Switched to momentary
...
Also updated the style of these lines slightly to match the style of the
default keymap
8 years ago
Jack Humbert
b8679bbe04
RGBW lights
8 years ago
Gergely Nagy
aa9c6e9f59
ergodox: Update algernon's keymap to v1.8
...
ADORE
-----
* Major rearrangements were made, to reduce pinky use, and to balance
out the hand usage.
Tools
-----
* The `hid-commands` tool will now display a notification when
the **AppSel** layer is triggered.
* The `log-to-heatmap.py` tool now treats the innermost keys on the
bottom row as thumb keys, as far as statistics are concerned.
Miscellaneous
-------------
* Fixed the **Steno** toggle key.
* My wife is now present on the keyboard too.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
coderkun
8dd69a1b05
Overwrite method hex_to_unicode() for make it compatible with Neo
8 years ago
coderkun
8655677584
Merge branch 'master' into coderkun_neo2
8 years ago
coderkun
a10e100bd5
Add double arrow Unicode characters to FMU layer
8 years ago
xyverz
e69e4c1ef2
Merge remote-tracking branch 'jackhumbert/master'
8 years ago
Erez Zukerman
35e6870e5c
Merge pull request #788 from chwilk/kastyle-refresh
...
Kastyle refresh
8 years ago
Chris McLennon
cce294df86
Remove config.h
8 years ago
Chris McLennon
65b0eff6d8
Contributing new keymap to Ergodox
8 years ago
chwilk
32cc2f6bd9
Added description of kastyle keymap
8 years ago
chwilk
e1bfe13090
Moved hand_swap_config array so all keyboards get it defined
8 years ago
chwilk
90fd0810db
Updated kastyle keymap, including swap hands feature
8 years ago
chwilk
04c0a1c3e2
Added ONEHAND_ENABLE to allow SWAP HANDS actions
8 years ago
Erez Zukerman
1a96b2cdc8
Disables sleep LED by default
8 years ago
Erez Zukerman
ce6a9a6c38
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
8 years ago
Erez Zukerman
6e5142ca3e
Adds EPRM reset key
8 years ago
Gergely Nagy
3e128552d9
Update the ergodox/algernon keymap to v1.7
...
Overall changes
===============
* The number row has been completely rearranged on both the **Base** and
the **ADORE** layers.
* The number/function key behavior was changed: function keys are now on
the **Media**.
* The `:`/`;` and `-`/`_` keys were put back to their thumb position on
the bottom row, on both the **Base** and **ADORE** layers.
* The bottom large keys on the inner side of each half now function as
[tmux](http://tmux.github.io/ ) keys: the left to send the prefix, the
right to send the `display-panes` key. The left also doubles as a GNU
screen prefix key, and sends `C-a` when double tapped.
* A number of functions, such as the **AppSel** layer, now require the
`hid-commands` tool to be running, with the output of `hid_listen`
being piped to it.
ADORE
=====
* `Y` and `X` have been swapped again.
Media/Navigation layer
======================
* The function keys are now on this layer.
* Mouse keys have been removed.
* Media start/stop/prev/next have been removed.
* `Print screen` has been removed.
* There is only one screen lock key now.
Heatmap
=======
* Fixed a few issues in the finger-stats calculation.
* The tool now also timestamps and saves all input lines to a logfile,
which it loads on start, allowing one to continue the collection after
upgrading the tool.
* The heatmap tool will now colorize the stats by default.
* The periodic stats are now printed in a more compact format.
Tools
=====
* Added a new tool, `tools/layer-notify` that listens to layer change
events on the HID console, and pops up a notification on layer
changes.
* Another new tool, `tools/text-to-log.py` has been added that converts
arbitrary text to a keylogger output, which can be fed to the heatmap
generator.
* A number of features have been moved to the `tools/hid-commands`
utility. These generally are OS dependent, and are easier to implement
on the software side.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Xyverz
26d6b90dde
Update readme.md
8 years ago
Erez Zukerman
a258358b6c
Merge pull request #758 from absenth/development
...
Absenth Ergodox Keymap Improvements
8 years ago
Lars R. Noldan
8a01bbc422
Adding Space Cadet, And Correcting Ascii Keymap
8 years ago
Erez Zukerman
23faf9ec81
Merge pull request #734 from adiabatic/master
...
Ergodox EZ: Zweihander keyboard layout updates
8 years ago
Erez Zukerman
862d93e0cb
Merge pull request #740 from absenth/development
...
Absenth's Layout- QWERTY with additional Media Layer Functions.
8 years ago
Didier Loiseau
21747cc310
Added readme.md for bepo_csa
8 years ago
Didier Loiseau
1aeb59335f
Fixed compilation issues after the merge
8 years ago
Didier Chagniot
83b6dd0cd6
readme.md updated
8 years ago
Didier Chagniot
67dfde765f
typing with it
8 years ago
Jack Humbert
5010df3d8b
Merge pull request #715 from profet23/master
...
Support for Ergodoxes with 80 keys.
8 years ago
Lars
52121cee7a
Updated Image Header
8 years ago
Lars
9c2015ea7f
first commit of Absenth's Ergodox Firmware
8 years ago
profet23
b83f76e1b0
Changing keymap name to "profet_80"
8 years ago
Roman Zolotarev
740b4bbe46
Fix typo
8 years ago
Nathan Sharfi
273a6cc688
- Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃
...
- remove media-space and media-shift-space; put a play/pause key at media-m instead
- add print screen, scroll lock, and pause/break to the media layer
And in the readme:
- don't say we don't have any Windows-specific keys
- add mnemonics for thumb-alt and thumb-ctrl positioning
8 years ago
Nathan Sharfi
e5396ca9e5
zweihander: rename to Makefile
8 years ago
Daniel
b807867f95
moves brackets from J/K to U/I to remove block of common vim sequence.
8 years ago
profet23
1406118c71
Removing separate ergodox80 project.
...
Created KEYMAP_80 in ez.h to support 80 key ergodoxes.
Creating default_80 keymap as ez keymap.
8 years ago
Erez Zukerman
0f111182a6
Merge pull request #732 from romanzolotarev/master
...
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
8 years ago
Roman Zolotarev
da16733e7a
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
8 years ago
joar
a3e7042084
norwegian programmer-friendly layout
8 years ago
Erez Zukerman
8b0769fe5a
Merge pull request #728 from fitzsim/yoruian
...
Add new ErgoDox EZ keymap, YORUIAN
8 years ago
Thomas Fitzsimmons
ce53c0643d
Fix ergodox_yoruian XKB naming
8 years ago
Thomas Fitzsimmons
e9ce4960c1
Add new ErgoDox EZ keymap, YORUIAN
8 years ago
Erez Zukerman
5bb29136b1
Merge pull request #686 from coderkun/coderkun_neo2
...
Merge Ergodox keymap “coderkun_neo2”
8 years ago
Erez Zukerman
45d68486a2
Merge pull request #678 from algernon/ergodox-ez/algernon
...
ergodox: Update algernon's keymap to v1.6
8 years ago
Daniel
250f096144
adds tap dance and macro to move underscore and l- and r- brackets to base layer.
8 years ago
Daniel
0c598f53c1
adds Hyper key. improves media layer. first attempt at tap dance.
8 years ago
Joshua T
5520b0022f
Merge remote-tracking branch 'upstream/master'
8 years ago
Daniel
dbac9f4954
Merge remote-tracking branch 'upstream/master'
8 years ago