gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
897 commits 1 branch 0 tags 10 MiB
Commit graph

897 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
997ecb4e10 magit-remote-ref-format: Improved documentation 2010-07-03 01:26:55 +08:00
Phil Jackson
f5ba22f966 Merge branch 'master' of https://github.com/philjackson/magit 2010-07-01 09:54:06 +01:00
Leo
d4dd5c5da0 Don't run magit-log-edit-mode-hook twice. 2010-07-01 09:52:00 +01:00
Phil Jackson
bdba20d5cc Fixed the ref/rev typo. 2010-06-30 15:55:01 +01:00
Phil Jackson
c505ef6faf Merge remote branch 'remotes/nex3/slash-style-refs' 2010-06-29 23:12:11 +01:00
Phil Jackson
dc49fde45e Replace slashes in tracking branch name suggestion. 2010-06-29 23:09:05 +01:00
Phil Jackson
fd6f6d5ea7 Manual entry for new branch mode binding. 2010-06-29 22:55:40 +01:00
Phil Jackson
42a70d14cc RET checks out a branch in the branch view. 2010-06-29 22:53:09 +01:00
Phil Jackson
bd01310032 Merge branch 'github-merge-requests' 2010-06-29 22:34:24 +01:00
Alan Falloon
809a5cb81c Use just the branch name for unpushed/unpulled when the remote is "." 
When the remote is "." it signifies that the current branch is
tracking another local branch, not a branch in one of the remotes. So,
in that case, use just the branch name as the upstream branch instead
of the "remote/branch" naming scheme.
 2010-06-30 05:21:01 +08:00
Alan Falloon
b65979510e Show branch name in "Remote:" section when tracking local branch 
When the current branch is tracking a local branch (the remote is ".")
show the local upstream branch in the "Remote:" section.
 2010-06-30 05:21:01 +08:00
Phil Jackson
04984e5265 Checkout works again in the branch view. 2010-06-29 22:08:14 +01:00
Phil Jackson
f74b1a560c Merge remote branch 'refs/remotes/nex3/rewrite-status-fix' 2010-06-28 21:31:36 +01:00
Phil Jackson
5aa79e249d Merge remote branch 'refs/remotes/nex3/nicer-name-rev' 2010-06-28 21:29:22 +01:00
Phil Jackson
aeb165ba3e Merge remote branch 'refs/remotes/nex3/update-remote-named-before-svn' 2010-06-28 21:24:46 +01:00
Yann Hodique
2d70b08682 minimizing extensions patch on top of upstream 2010-06-28 20:03:42 +02:00
Phil Jackson
613834919f Docstring for `magit-update-vc-modeline'. 2010-06-27 19:05:59 +01:00
Óscar Fuentes
51fffcb3a9 A better way for updating the VC modeline 
Revision 51a1b6d8 introduced a change that reverts all buffers after a
commit operation for refreshing the VC modeline info. This can be slow
(because refontification, etc) and have side effects (changes on display
settings for some modes.) Instead of reverting the buffer, we now call
`vc-find-file-hook' which is much faster and have no side effects. We
now update the VC modeline info after resetting, because that operation
may change the VC status without changing the file contents (commit a
change and then reset to HEAD^, for instance.)
 2010-06-27 18:47:31 +01:00
Phil Jackson
9c1a508827 Merge remote branch 'refs/remotes/nex3/push-new-branch' 
Closes #25.
 2010-06-27 18:43:26 +01:00
Nathan Weizenbaum
b8d6d5c08b Make sure magit-log-edit-toggle-field returns the right value. 2010-06-24 18:46:23 -07:00
Nathan Weizenbaum
5c5ba412b9 Add magit-wazzup-head and magit-wazzup-all-p variables for wazzup buffers. 2010-06-24 18:14:13 -07:00
Nathan Weizenbaum
cb5ca4ce40 Add a magit-reflog-head variable for reflog buffers. 2010-06-24 18:05:50 -07:00
Nathan Weizenbaum
abe8a031ff Add a magit-current-range variable for diff and log buffers. 2010-06-24 18:02:49 -07:00
Nathan Weizenbaum
81e2d01d03 The purpose of this branch is to expose more information about the current submode. 
Currently, many submodes retain state only in magit-refresh-args.
This prevents other code from easily accessing this state.
 2010-06-24 17:42:55 -07:00
Nathan Weizenbaum
120c5f8ec0 Merge branch 'master' into empty-commit 2010-06-24 17:31:48 -07:00
Nathan Weizenbaum
9542d41f89 Merge branch 'master' into guess-branch-guesses-commits 2010-06-24 17:31:14 -07:00
Nathan Weizenbaum
69499cdf45 Merge branch 'master' into ignore-file 2010-06-24 17:31:03 -07:00
Nathan Weizenbaum
cd9c46e226 Merge branch 'master' into log-edit 2010-06-24 17:30:52 -07:00
Nathan Weizenbaum
a6fa93b6cd Merge branch 'master' into nicer-name-rev 2010-06-24 17:30:38 -07:00
Nathan Weizenbaum
82f7ad57dd Merge branch 'master' into origin-default-remote 2010-06-24 17:30:15 -07:00
Nathan Weizenbaum
06c2902449 Merge branch 'master' into push-new-branch 2010-06-24 17:26:59 -07:00
Nathan Weizenbaum
51676dc866 Merge branch 'master' into rewrite-status-fix 2010-06-24 17:26:53 -07:00
Nathan Weizenbaum
c57f12976d Merge branch 'master' into slash-style-refs 2010-06-24 17:26:43 -07:00
Nathan Weizenbaum
0271bd562c Merge branch 'master' into update-remote-named-before-svn 2010-06-24 17:26:38 -07:00
Nathan Weizenbaum
9cc5e7e5d2 Document the new branch behavior. 2010-06-24 17:17:58 -07:00
Nathan Weizenbaum
a5b72daa02 When pushing a new branch, manually add merge configuration. 2010-06-24 16:56:18 -07:00
Nathan Weizenbaum
9b195b61e9 Properly handle pushing a branch without a remote. 
Before, this did "git push remote branch-name:nil".
Now it does "git push remote branch-name".
Git automatically sets up the remote.
 2010-06-24 16:40:28 -07:00
Nathan Weizenbaum
8e3916d2f4 Add a note in the manual about C-c C-e. 2010-06-24 16:33:15 -07:00
Nathan Weizenbaum
ed9cb1eafa Add an edit-log-mode toggle for allowing empty commits. 
This is useful for creating commits that are just notes, with no contents.
 2010-06-24 16:31:50 -07:00
Nathan Weizenbaum
40fca42d92 Abstract out a magit-log-edit-toggle-field function. 2010-06-24 16:20:03 -07:00
Nathan Weizenbaum
1efde9202c Filter out HEAD refs from magit-name-rev. 
HEAD refs are nasty because they're highly contingent.
Branches, tags, and remotes all require some commit to be made
in order for the ref to point to a different rev,
but HEADs just need something else to be checked out.

Also, filtering out HEADs makes the name more portable.
This is useful for Magithub, where the name may be passed on to GitHub.
 2010-06-24 15:56:54 -07:00
Nathan Weizenbaum
2ea8cb2595 Add a magit-rev-parse function. 2010-06-24 15:53:20 -07:00
Moritz Bunkus
043f4383de Remove "remotes/" prefix from remote branch names 
git cannot find a branch named "remotes/repository/branch" with
most (all?) of its commands, e.g. "git branch -d -r ..." or "git
merge".
 2010-06-20 17:32:34 +01:00
Moritz Bunkus
8bcbcb369e Set 'remote branch' text property in branch view 
This only works with git versions that prefix remote branches with
"remotes/" in the output of "git branch -va". git 1.7 and 1.6.3 do,
git 1.5.6.5 does not.
 2010-06-20 17:32:34 +01:00
Phil Jackson
110e9063a3 Merge remote branch 'refs/remotes/nex3/read-rev-history' 2010-06-17 22:11:54 +01:00
Phil Jackson
1e8d4aaf0a Merge remote branch 'refs/remotes/alexott/master' 2010-06-17 12:36:55 +01:00
Alex Ott
449bebe757 get true name for directories, that specified by symlinks 2010-06-17 13:08:17 +02:00
Nathan Weizenbaum
8cc37dcb99 Fix ref ambiguity detection. 2010-06-17 01:57:28 -07:00
Nathan Weizenbaum
daa3ab8987 Remove tags/ and remotes/ in name-rev when that doesn't create ambiguity. 2010-06-17 00:10:35 -07:00
Nathan Weizenbaum
c337dcc07c Make magit-name-rev a little cleaner. 
The main thing is using --no-undefined to eliminate an extra check.
 2010-06-16 23:55:51 -07:00