Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
git commit: Allow editing on all occasions. Sometimes it may be handy to be able to edit messages that come from somewhere other than an existing commit. This makes 'git commit -F <file> -e' to start editor with the initial log message contents taken from <file>. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Do not verify reverted/cherry-picked/rebased patches. The original committer may have used validation criteria that is less stricter than yours. You do not want to lose the changes even if they are done in substandard way from your 'commit -v' verifier's point of view. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix compilation warnings. ... found by compiling them with gcc 2.95. Signed-off-by: Junio C Hamano <junkio@cox.net>
A Large Angry SCM
[PATCH] Update Thunderbird specific hints. Setting the wraplength to zero keeps the bird from trimming WS. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 1d535d525d6a0ddddc3755065d721278bc5f0aff commit)
A Large Angry SCM
[PATCH] Documentation for git-request-pull-script. Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 10dce95490cb02f66b3a08984ccdee0a92b48236 commit)
A Large Angry SCM
[PATCH] Documentation for git-clone-dumb-http. Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from f79528e5d05a64d68b8e09a18521950775e99ec1 commit)
A Large Angry SCM
[PATCH] Documentation for git-daemon. Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 5d0a4efeff62cfa363437f91308453b5b9fd8cf5 commit)
Junio C Hamano
Merge refs/heads/master from .
Paul Mackerras
Draw selected graph line thicker and make arrowheads active.
Junio C Hamano
Accumulated documentation updates. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-repack-script: Add option to repack all objects. This originally came from Frank Sorenson, but with a bit of rework to allow future enhancements without changing the external interface for pack pruning part. With the '-a' option, all objects in the current repository are packed into a single pack. When the '-d' option is given at the same time, existing packs that were made redundant by this round of repacking are deleted. Since we currently …
Junio C Hamano
Updates: show-branch Earlier show-branch gave names only to commits reachable via first parent ancestry chain. Change the naming code to name everybody. The original idea was to stop at the first merge point in the topological order, and --more=<n> to show commits until we show <n> more extra merge points. However depending on the order of how we discover the commits, it additionally showed parents of the <n>th mer…
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
mailinfo and applymbox updates This attempts to minimally cope with a subset of MIME "features" often seen in patches sent to our mailing lists. Namely: - People's name spelled in characters outside ASCII (both on From: header and the signed-off-by line). - Content-transfer-encoding using quoted-printable (both in multipart and non-multipart messages). These MIME features are detected and decoded by "git mailinfo". …
Junio C Hamano
Document "git cherry-pick" and "git revert" Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove git-apply-patch-script. Now the rebase is rewritten to use git cherry-pick, there is no user for that ancient script. I've checked Cogito and StGIT to make sure they do not use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Redo "revert" using three-way merge machinery. The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own …
Junio C Hamano
Revert "Replace zero-length array decls with []." This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit, whose change breaks gcc-2.95. Not that I ignore portability to compilers that are properly C99, but keeping compilation with GCC working is more important, at least for now. We would probably end up declaring with "name[1]" and teach the allocator to subtract one if we really aimed for portability, but that is left for later rounds. …
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
Amos Waterland
[PATCH] tutorial note about git branch Explain that an asterisk will be displayed in front of the current branch when you run `git branch' to see which are available. Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
Update SubmittingPatches. - It does not matter how I read git list. What matters is that I do not necessarily read everything on it. - Talk a bit about how to use applymbox to check one's own patches. - Talk a bit about PGP signed patches. Signed-off-by: Junio C Hamano <junkio@cox.net>
A Large Angry SCM
[PATCH] Add footnote about Thunderbird about trimming trailing WS. Add footnote about Thunderbird about trimming trailing WS. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
A Large Angry SCM
[PATCH] Add some documentation. Add some documentation. Text taken from the the commit messages and the command sources. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Robert Fitzsimons
[PATCH] New git-apply test cases for scanning forwards and backwards. Added a new test case for the scanning forwards and backwards for the correct location to apply a patch fragment. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Robert Fitzsimons
[PATCH] New git-apply test cases for patches with mulitple fragments. Added a test case for patches with multiple fragments. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Robert Fitzsimons
[PATCH] Fix git patch header processing in git-apply. Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Teach git-status-script about git-ls-files --others When there is non-empty $GIT_DIR/info/exclude file, use it along with .gitignore per-directory exclude pattern files (which was a convention agreed on the list while ago and is compatible with Cogito) to generate a list of ignored files as well. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit)
Junio C Hamano
Show the branch name more prominently in "git status". When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next