Commit graph

99 commits

Author SHA1 Message Date
Marius Vollmer
ff353152c6 Merge branch 'master' into dev 2008-08-11 05:42:43 +03:00
Marius Vollmer
a5b4bcd354 Renamed *git-process* buffer to *magit-process*. 2008-08-11 05:42:07 +03:00
Marius Vollmer
133e40b90b Make *magit-commit* buffer read-only. 2008-08-11 05:41:28 +03:00
Marius Vollmer
2e07984097 Actually pass the head to git-log. 2008-08-11 05:18:55 +03:00
Marius Vollmer
09bc05a11f Prepare a cherry. 2008-08-11 05:17:45 +03:00
Marius Vollmer
5742fa3476 Branch browsing. 2008-08-11 05:16:43 +03:00
Marius Vollmer
eb62d6d59f Initial support for history browsing. 2008-08-11 05:10:10 +03:00
Marius Vollmer
16eb6acc95 Support for add-change-log-entry kind of functionality.
* magit.el (magit-add-log): New, bind it to `C'.
2008-08-11 03:23:54 +03:00
Marius Vollmer
2f5d41a8ac Be more accurate when visiting via hunks.
* magit.el (magit-hunk-target-line): New.
(magit-visit-thing-at-point): Use it.
2008-08-11 03:22:50 +03:00
Marius Vollmer
036448e1b8 Add section markers to washed output and try to preserve position when
updating status buffer.
2008-08-11 01:28:35 +03:00
Marius Vollmer
db13d0c863 Be more verbose. 2008-08-08 19:01:24 +03:00
Marius Vollmer
bd27dcd948 Updated. 2008-08-07 03:03:26 +03:00
Marius Vollmer
8625e157af Docs and hooks. 2008-08-07 03:02:45 +03:00
Marius Vollmer
6801bef645 Mode-ify magit-mode and allow multiple status buffers to exist. 2008-08-07 01:49:35 +03:00
Marius Vollmer
7a3e2bdf2c Correctly reset state when starting a new hunk. 2008-08-06 15:51:09 +03:00
Marius Vollmer
abb3b6880c Updated. 2008-08-06 15:49:51 +03:00
Marius Vollmer
66d50d8466 Describe things at point. 2008-08-06 15:48:55 +03:00
Marius Vollmer
adfb76c91d Soft resetting. 2008-08-06 14:48:03 +03:00
Marius Vollmer
e9132a53d4 Resetting. 2008-08-06 14:41:48 +03:00
Marius Vollmer
c55f27dadd Show merge heads in status and don't insert MERGE_MSG in log-edit buffer. 2008-08-06 04:18:41 +03:00
Marius Vollmer
c4afadff2e Omit last empty element in shell-lines.
New file-lines function.
2008-08-06 04:13:40 +03:00
Marius Vollmer
7ce74c2879 Didn't know about split-string... 2008-08-06 03:47:42 +03:00
Marius Vollmer
45f8fa9763 Updated. 2008-08-06 03:47:26 +03:00
Marius Vollmer
25ee763f82 Moved things around a bit. 2008-08-06 03:22:22 +03:00
Marius Vollmer
86157f2586 Don't wash the --stat output. 2008-08-06 03:22:01 +03:00
Marius Vollmer
7199553a75 Renamed to follow convention. 2008-08-06 02:46:58 +03:00
Marius Vollmer
14c98293ee Added GPLv3 text. 2008-08-06 02:44:55 +03:00
Marius Vollmer
e448d4f214 Updated 2008-08-06 02:44:41 +03:00
Marius Vollmer
5baf4ddf71 Renamed to magit. 2008-08-06 02:41:05 +03:00
Marius Vollmer
3cb3b56759 Renamed. 2008-08-06 02:38:46 +03:00
Marius Vollmer
2ed9be3900 Dude. 2008-08-06 02:33:48 +03:00
Marius Vollmer
ed3f46e6ee Ds some sanity checks before running git-checkout. It's too dangerous
otherwise.
2008-08-06 02:32:27 +03:00
Marius Vollmer
75879b1bfb Use git-branch to list branches. 2008-08-06 02:29:30 +03:00
Marius Vollmer
9117e8ae95 Be quiet. 2008-08-06 02:22:52 +03:00
Marius Vollmer
2867ab7b00 Revert files after an operation. 2008-08-06 02:21:29 +03:00
Marius Vollmer
7dfae6e402 Call save-some-changes before getting status. 2008-08-06 01:53:39 +03:00
Marius Vollmer
bfe37ddf3e Updated. 2008-08-06 01:53:26 +03:00
Marius Vollmer
bbf7ef5127 Undo last merge, stage-all is only on'A'. 2008-08-06 01:29:06 +03:00
Marius Vollmer
9744267066 Merge branch 'dev'. 2008-08-06 01:26:43 +03:00
Marius Vollmer
feb8dee1bc Actually pass the branch to git-merge... 2008-08-06 01:22:12 +03:00
Marius Vollmer
84dfe20e34 Also put stage-all on 'S'. 2008-08-06 01:18:33 +03:00
Marius Vollmer
7dce8dc86d Merging... 2008-08-06 01:17:34 +03:00
Marius Vollmer
59bb26ef47 Move stage-all to 'A'.
Added branch switching and creation.
2008-08-06 01:08:07 +03:00
Marius Vollmer
1092418d16 Make branch name and titles bold. 2008-08-06 00:47:07 +03:00
Marius Vollmer
003430ee4f Just run git-add for staging whole diffs, and git =-reset for unstaging them. 2008-08-06 00:34:29 +03:00
Marius Vollmer
3463cee16d Handle visiting fiss and hunks. 2008-08-06 00:30:37 +03:00
Marius Vollmer
28b41747bf Don't insert git-status in commit message, it's useless. 2008-08-06 00:04:17 +03:00
Marius Vollmer
cb83f79461 Cleanup commit message before committing.
Insert merge message and status information into log edit buffer.
2008-08-05 22:30:10 +03:00
Marius Vollmer
de3b615a6d Make title optional. 2008-08-05 22:21:51 +03:00
Marius Vollmer
9f7406e5ca Diff with HEAD to find unpushed changes. 2008-08-05 19:54:32 +03:00