Commit graph

812 commits

Author SHA1 Message Date
Phil Jackson
bdebdfcf8d Merged the different type of... merges. 2010-09-05 11:02:26 +01:00
Robin Green
3dd1ef3a35 Fix typo 2010-09-05 17:24:45 +08:00
Robin Green
0d67135e89 Add new file to Makefile.am 2010-09-05 17:24:45 +08:00
Phil Jackson
9522698ce5 Remove redundant functions from merge command. 2010-09-03 20:17:17 +01:00
Phil Jackson
cb20289fc9 Removed superfluous debugging. 2010-09-03 20:14:59 +01:00
Phil Jackson
31387d2f50 Prefix arg allows pulling from a specified location. 2010-09-03 19:04:54 +01:00
Phil Jackson
2733adb8b6 Added a stash menu. 2010-09-03 18:50:39 +01:00
Phil Jackson
653cc89684 Added a merge menu. 2010-09-03 18:34:37 +01:00
Phil Jackson
ee84d43a18 Require assoc. 2010-09-02 18:22:13 +01:00
Phil Jackson
22186b0636 Fix create-branch. 2010-09-02 16:20:03 +01:00
Phil Jackson
21fb0a9ea3 Formatting. 2010-09-02 16:09:07 +01:00
Phil Jackson
08181fde85 A couple more options for committing. 2010-09-02 15:37:53 +01:00
Phil Jackson
b9ad56506c Slimmed right down the log-edit stuff. 2010-09-02 15:22:29 +01:00
Phil Jackson
03c5dec5b6 Formatting. 2010-09-02 00:10:20 +01:00
Phil Jackson
f4b5a8cb8f Docs. 2010-09-02 00:10:05 +01:00
Phil Jackson
548b2e567f Separation of fetch and remote update. 2010-09-02 00:00:42 +01:00
Phil Jackson
a3f38d4111 Docs. 2010-09-01 23:53:23 +01:00
Phil Jackson
78a3d703b0 Added -n to push menu. Added magit-custom-options to push command. 2010-09-01 23:50:25 +01:00
Phil Jackson
564726a247 Use `window-width' to wrap menu items. 2010-09-01 23:43:57 +01:00
Phil Jackson
2e00a113d9 Added `magit-custom-options' to git-pull. 2010-09-01 23:02:19 +01:00
Phil Jackson
c02fffb97e Added push/pull menus. 2010-09-01 22:28:33 +01:00
Phil Jackson
42fc3dac9c Remove rebase behaviour from pull. 2010-09-01 22:27:39 +01:00
Phil Jackson
70ee1c5301 Added a branching menu. 2010-09-01 22:13:08 +01:00
Phil Jackson
ceb77d506d Added a branch menu. 2010-09-01 21:49:58 +01:00
Phil Jackson
2cf4192097 Docs. 2010-09-01 21:35:09 +01:00
Phil Jackson
fd23002268 Don't add a newline if a menu item is the last. 2010-09-01 21:33:57 +01:00
Phil Jackson
e19f302976 Columify switches too. 2010-09-01 21:14:46 +01:00
Phil Jackson
b03829c7be Make sure the menu turns up at the bottom of the window. 2010-09-01 20:36:02 +01:00
Phil Jackson
1403c3607a All switches fontified. 2010-09-01 19:40:56 +01:00
Phil Jackson
b67b2558d8 draw-switches function. 2010-09-01 19:39:58 +01:00
Phil Jackson
1440328eaa All args fontified. 2010-09-01 19:38:39 +01:00
Phil Jackson
ab566aaee9 draw-args function. 2010-09-01 19:37:08 +01:00
Phil Jackson
880b98d60e All actions fontified. 2010-09-01 19:35:12 +01:00
Phil Jackson
4ab9bab7c5 Start of on-the-fly font-locking. 2010-09-01 19:32:10 +01:00
Phil Jackson
02600a8e47 Pretty layout of actions. 2010-09-01 19:27:49 +01:00
Phil Jackson
ee332fdf4f Allow for case insensitivity in patterns. 2010-09-01 10:46:54 +01:00
Phil Jackson
e91decf335 Added a tagging menu. 2010-09-01 10:45:09 +01:00
Phil Jackson
1aa8787cee Fix non-display of option. 2010-09-01 10:27:14 +01:00
Phil Jackson
c3971bbbd0 Revert (again) to the split-window method of display. 2010-09-01 10:24:17 +01:00
Phil Jackson
3b22dbcd5a Concat -> format. 2010-09-01 10:21:50 +01:00
Phil Jackson
e882f3c78a Put rebasing commands in menu. 2010-09-01 10:17:21 +01:00
Phil Jackson
3d1b2039ec Remove unneeded defuns. 2010-09-01 00:07:41 +01:00
Phil Jackson
644cdf82df Added branches arg. 2010-09-01 00:03:35 +01:00
Phil Jackson
bad6cc9817 Added merge commit switch. 2010-08-31 23:51:58 +01:00
Phil Jackson
f68a3d1a8f Changed the prefix for args to '='. 2010-08-31 23:46:50 +01:00
Phil Jackson
88ea40f3f3 Added author arg. 2010-08-31 23:41:15 +01:00
Phil Jackson
c0324a5a09 Fixed quit. 2010-08-31 23:41:03 +01:00
Phil Jackson
fc2fe2b56e Arguments now being passed through. 2010-08-31 23:34:46 +01:00
Phil Jackson
a9bba80284 Output propertised arg value. 2010-08-31 22:29:30 +01:00
Phil Jackson
217febcb00 Args being remembered. 2010-08-31 22:04:36 +01:00