aac73da95df265e9c45e510f8b376a7168118244 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/ad04fba40ad1335833fe489d5807589ffb9e9443 ad04fba40ad1335833fe489d5807589ffb9e9443 2009-06-21T12:13:21-07:00 2009-06-21T12:13:21-07:00 Fix -U for diffs in the status buffer. b2d87d9e7dfd99690faf8b453bc1868e8e8408f2 Marius Vollmer marius.vollmer@gmail.com 46b462bc24d18e3b7b615e676f95d06cd4cc2b19 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/aac73da95df265e9c45e510f8b376a7168118244 aac73da95df265e9c45e510f8b376a7168118244 2009-06-21T12:09:35-07:00 2009-06-21T12:09:35-07:00 Fix display of unmerged paths. * magit.el (magit-wash-diff-section): Pick out 'file' from match data. 9b73659cc176124e90f71ef258b0d19c99c9e10e Marius Vollmer marius.vollmer@gmail.com c1b0da8afdc4496e528616545f667ebc6dcb3fa8 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/46b462bc24d18e3b7b615e676f95d06cd4cc2b19 46b462bc24d18e3b7b615e676f95d06cd4cc2b19 2009-06-08T11:37:16-07:00 2009-06-08T11:37:16-07:00 Hide status diffs by default again. * magit.el (magit-wash-diff): By binding magit-section-hidden-default appropriately here... (magit-wash-numstat-diff): ...and here. 06dda4ec7fca9d56d3ee6ce7b8853922fa03327e Marius Vollmer marius.vollmer@gmail.com 2c9e6d7ee4d463e0640e725371246e84afe608dd Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/c1b0da8afdc4496e528616545f667ebc6dcb3fa8 c1b0da8afdc4496e528616545f667ebc6dcb3fa8 2009-06-07T15:09:48-07:00 2009-06-07T15:09:48-07:00 Don't include git-svn branches in the 'interesting branches'. * magit.el (magit-list-interesting-refs): Here. 23e6d8e14790fb86c9bc3104b290982999ec292c Marius Vollmer marius.vollmer@gmail.com 6fcff5f170f70fa20de7b9d822cec82e7de319e2 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/2c9e6d7ee4d463e0640e725371246e84afe608dd 2c9e6d7ee4d463e0640e725371246e84afe608dd 2009-06-07T12:05:07-07:00 2009-06-07T12:03:15-07:00 Make magit-ref-exists-p work. * magit.el (magit-ref-exists-p): Use correct invocation and turn exit code into a boolean. (Saturday night hacking sessions are not my forte. Sundays on the other hand...) 20782c2e914e690be8fbbdb4c48e7e22bcd1806a Marius Vollmer marius.vollmer@gmail.com c208d194b60374afb52e615066f216aea158ddbc Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/6fcff5f170f70fa20de7b9d822cec82e7de319e2 6fcff5f170f70fa20de7b9d822cec82e7de319e2 2009-06-07T12:05:07-07:00 2009-06-07T11:57:39-07:00 Cosmetics. 7b02f66194267b206aeb7a306a987490c0dcd7c6 Marius Vollmer marius.vollmer@gmail.com 03329dbfc33ba3058401fff41c7f495dacb49190 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/c208d194b60374afb52e615066f216aea158ddbc c208d194b60374afb52e615066f216aea158ddbc 2009-06-07T12:05:05-07:00 2009-06-07T12:04:35-07:00 Directly look for git-svn ref name, don't use magit-list-interesting-refs. * magit.el (magit-get-svn-ref): Here, by using magit-ref-exists-p. c481f1c54fe036b1c883752dda4922d4cec9e46a Marius Vollmer marius.vollmer@gmail.com d7be60af1cb7cf16e6b11952de5db99c9bed7e36 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/03329dbfc33ba3058401fff41c7f495dacb49190 03329dbfc33ba3058401fff41c7f495dacb49190 2009-06-07T11:42:42-07:00 2009-06-07T11:42:20-07:00 Only discard staged diffs for files that don't have unstaged changes. The unstaged changes will be discarded, too, which might be unexpected. * magit.el (magit-discard-item): Here. 4a9f6e7ae970aab1f5a7224cd195419fc8dfb0e1 Marius Vollmer marius.vollmer@gmail.com 29eafdc9930ff764133c84b5ca71131b4af1dc3e Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/d7be60af1cb7cf16e6b11952de5db99c9bed7e36 d7be60af1cb7cf16e6b11952de5db99c9bed7e36 2009-06-07T11:41:09-07:00 2009-06-07T11:41:09-07:00 Don't allow slashes in remote nicknames. * magit.el (magit-list-interesting-refs): Here. (magit-maybe-create-local-tracking-branch): And here. 22154f17d19f95d49c1d17d9ca12fb2ec7496f9b Marius Vollmer marius.vollmer@gmail.com b2072a36043af9393deb54d72abcc464dfaf714d Steve Purcell steve@sanityinc.com http://github.com/jwiegley/magit/commit/29eafdc9930ff764133c84b5ca71131b4af1dc3e 29eafdc9930ff764133c84b5ca71131b4af1dc3e 2009-06-07T11:24:47-07:00 2009-06-07T09:11:16-07:00 Fix display of unpushed/unpulled git-svn patches git-svn remotes are listed by "git show-ref" in a pattern that magit-list-interesting-refs did not support, e.g. "refs/remotes/git-svn". 45f065d76b389379eef30f8ad0065d21ca55cb5c Marius Vollmer marius.vollmer@gmail.com 56df9cac09f2313a8e0ae08467800f4906d81c07 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/b2072a36043af9393deb54d72abcc464dfaf714d b2072a36043af9393deb54d72abcc464dfaf714d 2009-06-07T11:17:07-07:00 2009-06-07T11:17:07-07:00 It' magit-wash-diff-section, not magit-wash-section-diff... * magit.el (magit-wash-diff): Here. 5f450f997197bcf726755374fc7136f995adc57a Marius Vollmer marius.vollmer@gmail.com fb7ede719cce4be5b3214d8b5ade63e554c1259d Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/56df9cac09f2313a8e0ae08467800f4906d81c07 56df9cac09f2313a8e0ae08467800f4906d81c07 2009-06-06T13:49:56-07:00 2009-06-06T13:49:56-07:00 Don't use make-variable-buffer-local during mode setup. * magit.el (magit-mode): Use make-local-variable instead. 97b00a35f5d06ea4685d89d18010c47610340acf Marius Vollmer marius.vollmer@gmail.com 80f990f94e1b09034fdad671ce1635eb7f98dedf Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/fb7ede719cce4be5b3214d8b5ade63e554c1259d fb7ede719cce4be5b3214d8b5ade63e554c1259d 2009-06-06T13:49:02-07:00 2009-06-06T13:49:02-07:00 Delay inserting and washing of big diffs. * magit.el (magit-set-section-needs-refresh-on-show): New. (magit-section-set-hidden): Call magit-refresh when a 'needs-refresh-on-show' section is shown. (magit-show-level): Wrap it in magit-with-refresh. (magit-wash-diff, magit-wash-diff-section): Factored washing and section construction into seperate functions. (magit-insert-diff, magit-wash-numstat-diffs, magit-wash-numstat-diff): New. Use magit-insert-diff for visible sections or for small changes. (magit-insert-unstaged-changes): Use a numstat diff instead of a full diff. (magit-insert-staged-changes): Likewise. e08a0170358ebd7efb371c9bac0ba39e0121c3ff Marius Vollmer marius.vollmer@gmail.com 98e2b50a52bbe94c297b0af8bd486d7f3ad6b9b0 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/80f990f94e1b09034fdad671ce1635eb7f98dedf 80f990f94e1b09034fdad671ce1635eb7f98dedf 2009-06-06T13:17:12-07:00 2009-06-06T13:17:12-07:00 README updates. 4f2da437be3f19d024171060a81cbd8d253b9fb8 Marius Vollmer marius.vollmer@gmail.com a76f44c1d89b3fe14ca34b760849ba36f7dcbbc7 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/98e2b50a52bbe94c297b0af8bd486d7f3ad6b9b0 98e2b50a52bbe94c297b0af8bd486d7f3ad6b9b0 2009-06-06T09:50:16-07:00 2009-06-06T09:50:16-07:00 Be robust against the *magit-process* buffer getting killed. * magit.el (magit-run*): Only consider Git to be running when the *magit-process* buffer still exists. 6a52be42536e6bce98a08967011c545ac7fef0d8 Marius Vollmer marius.vollmer@gmail.com 01f37a8c2d51aef6e760c5fa025cd357db33c0b1 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/a76f44c1d89b3fe14ca34b760849ba36f7dcbbc7 a76f44c1d89b3fe14ca34b760849ba36f7dcbbc7 2009-06-06T09:42:02-07:00 2009-06-06T09:42:02-07:00 Make discarding staged diffs work. * magit.el (magit-discard-diff): Added stagedp parameter and checkout from HEAD if it is true. (magit-discard-item): Use it. 02497c0617b37662048179072a1f616678ab8b25 Marius Vollmer marius.vollmer@gmail.com cd4f15f314cfaa74cd992c55fccd95bf5ce6cae0 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/01f37a8c2d51aef6e760c5fa025cd357db33c0b1 01f37a8c2d51aef6e760c5fa025cd357db33c0b1 2009-06-06T09:29:52-07:00 2009-06-06T09:29:52-07:00 Don't mess with the global value of line-move-visual. * magit.el (magit-mode): Make line-move-visual buffer local before setting it. Thanks Leo! b935898bcc6383ea3682c3cd00465f38587dd573 Marius Vollmer marius.vollmer@gmail.com 7700954ee4e081c3236e01c5b04e323e519ede08 Marcin Bachry hegel666@gmail.com http://github.com/jwiegley/magit/commit/cd4f15f314cfaa74cd992c55fccd95bf5ce6cae0 cd4f15f314cfaa74cd992c55fccd95bf5ce6cae0 2009-06-06T09:23:02-07:00 2009-05-17T10:34:09-07:00 Explicitly disallow rewriting history from the first commit. * magit.el (magit-rewrite-start): Use magit-commit-parents to find base commit for rewrite and signal error if there isn't any. 06976575296d1564c6588782f957b458bfbbe4bc Marius Vollmer marius.vollmer@gmail.com 9f9370ce620e64d2a1ad52aa9860adb8bbf54eb4 Marcin Bachry hegel666@gmail.com http://github.com/jwiegley/magit/commit/7700954ee4e081c3236e01c5b04e323e519ede08 7700954ee4e081c3236e01c5b04e323e519ede08 2009-06-06T09:16:35-07:00 2009-05-17T07:58:37-07:00 Fix shell escaping. * magit.el (magit-escape-for-shell): use literal argument to replace-regexp-in-string function. df87826dfa2eed6df0dd6c7f3113573739756e11 Marius Vollmer marius.vollmer@gmail.com 65e5363170175742ef97b51d89ce445bf49eae4a Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/9f9370ce620e64d2a1ad52aa9860adb8bbf54eb4 9f9370ce620e64d2a1ad52aa9860adb8bbf54eb4 2009-06-06T05:23:29-07:00 2009-06-06T05:23:29-07:00 Document C-c C-s signoff toggling. 2d2f8d84257b3b1a88530b717f24421fa0e185c9 Marius Vollmer marius.vollmer@gmail.com e9c108a9722f11ed1a322733af28f89c1b3190ba Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/65e5363170175742ef97b51d89ce445bf49eae4a 65e5363170175742ef97b51d89ce445bf49eae4a 2009-06-06T05:23:08-07:00 2009-06-06T05:18:15-07:00 Allow overriding of magit-commit-signoff per commit. Signed-off-by: Marius Vollmer <marius.vollmer@gmail.com> 720509844a946f5020b2956fd73f633b906681de Marius Vollmer marius.vollmer@gmail.com 1183c3af94997ce7340c1ec69cf47122b8716e31 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/e9c108a9722f11ed1a322733af28f89c1b3190ba e9c108a9722f11ed1a322733af28f89c1b3190ba 2009-06-06T05:06:46-07:00 2009-06-06T05:06:46-07:00 Document changes. 1215e47195370d77147d782f2dd44916eca5f539 Marius Vollmer marius.vollmer@gmail.com e2fdbc2d011dec04ed4fc2a0cce128624e0e7e98 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/1183c3af94997ce7340c1ec69cf47122b8716e31 1183c3af94997ce7340c1ec69cf47122b8716e31 2009-06-06T05:02:58-07:00 2009-06-06T04:52:05-07:00 Don't use refs/heads/ prefix when checking out branches. * magit.el (magit-list-interesting-refs): Here. 9ab4700426d753f77bb11d5630a0e75f72a558ba Marius Vollmer marius.vollmer@gmail.com 2d5aff1b876b70e1bf2c66e11e7459cb04eaad0e Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/e2fdbc2d011dec04ed4fc2a0cce128624e0e7e98 e2fdbc2d011dec04ed4fc2a0cce128624e0e7e98 2009-06-06T05:02:55-07:00 2009-06-06T04:54:30-07:00 Offer to create tracking branches when switching to a remote branch. * magit.el (magit-ref-exists-p): New. (magit-maybe-create-localtracking-branch): New. (magit-checkout): Use it. 6b94b1eb2509db105538d4d000aef1a0ffc6b869 Marius Vollmer marius.vollmer@gmail.com e0911af08ef9b869f27daf11d1102fe7b718ee08 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/2d5aff1b876b70e1bf2c66e11e7459cb04eaad0e 2d5aff1b876b70e1bf2c66e11e7459cb04eaad0e 2009-06-06T04:26:18-07:00 2009-06-06T04:26:18-07:00 Use git show-ref to find interesting refs. * magit.el (magit-list-interesting-refs): Use "git show-ref" instead of trying to parse output of "git branch". Return alist with name / ref pairs. (magit-read-rev, magit-get-svn-branch-name): Updated. (magit-refresh-wazzup-buffer): Use magit-list-interesting-refs instead of parsing "git branch" output. cd06c99de54760f7e3846f6e067426cb35802cd1 Marius Vollmer marius.vollmer@gmail.com 824f0e0e05983ca38a33ba29c297a7482f6d48ad Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/e0911af08ef9b869f27daf11d1102fe7b718ee08 e0911af08ef9b869f27daf11d1102fe7b718ee08 2009-06-06T03:40:29-07:00 2009-06-06T03:40:29-07:00 We are interested in refs not revs. * magit.el (magit-list-interesting-refs): Renamed from magit-list-interesting-revisions. Updated all callers. ac852ea1b46324ad0df08d9c3af6d3754e34a104 Marius Vollmer marius.vollmer@gmail.com 9dedc1b8f0dad0edb48ffaf9a7e69690995af142 96de3a7863e679bf520c198851da3ef841586a6f Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/824f0e0e05983ca38a33ba29c297a7482f6d48ad 824f0e0e05983ca38a33ba29c297a7482f6d48ad 2009-03-22T04:04:46-07:00 2009-03-22T04:04:46-07:00 Merge commit 'jwiegley/master' 9a9bb9a36f0e2b2c1726f608df4dbbb56091cc1d Marius Vollmer marius.vollmer@gmail.com 4bc9bc2c73c59395628d07b8a5d95636dac62f79 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/9dedc1b8f0dad0edb48ffaf9a7e69690995af142 9dedc1b8f0dad0edb48ffaf9a7e69690995af142 2009-03-21T17:02:31-07:00 2009-03-21T17:02:31-07:00 Some news. 5aadb53b5f16e6af71b0e084f505e1554fc621fd Marius Vollmer marius.vollmer@gmail.com 6f2d0955e5eee30d396a5fb78a47670faf38b625 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/4bc9bc2c73c59395628d07b8a5d95636dac62f79 4bc9bc2c73c59395628d07b8a5d95636dac62f79 2009-03-21T16:54:52-07:00 2009-03-21T16:54:52-07:00 Document new behavior of 'c' and 'C' during a rebase. 68756107507ac95f6d1c3ce0c272a36ebd0c4175 Marius Vollmer marius.vollmer@gmail.com 904e6ee405d916ddd04b9c0535cc06db9926c7d2 Marius Vollmer marius.vollmer@gmail.com http://github.com/jwiegley/magit/commit/6f2d0955e5eee30d396a5fb78a47670faf38b625 6f2d0955e5eee30d396a5fb78a47670faf38b625 2009-03-21T16:48:43-07:00 2009-03-21T16:40:40-07:00 Improve treatment of unmerged files in "Staged changes". * magit.el (magit-wash-diff): Recognize "Unmerged path" lines and create a diff section for it. * magit.el (magit-unstage-item): Don't unstage unmerged files. 3f4ff6541aec1dce22e4bd19a6dfa2a52c076b43 Marius Vollmer marius.vollmer@gmail.com