Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 0.99.4. Mark it official. Finally. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge with master. This merges commit e8c80638abc99928dba9ac832589749a531e2e21 from master into our head commit bdb71a41caa9ffed2e3207736c21fffbc2007670 Sincerely, jit-merge command.
Junio C Hamano
Merge with gitk. This merges commit 466e4fdd6696c89700294e1a54fa73e1fb94643b from gitk into our head commit ef0bd2e6e643f09a8294937caf99463328b9215a Sincerely, jit-merge command.
Junio C Hamano
Merge with master. This merges commit ef0bd2e6e643f09a8294937caf99463328b9215a from master into our head commit f69714c38c6f3296a4bfba0d057e0f1605373f49 Sincerely, jit-merge command.
Johannes Schindelin
[PATCH] Fix git-rev-parse's parent handling git-rev-parse HEAD^1 would fail, because of an off-by-one bug (but HEAD^ would yield the expected result). Also, when the parent does not exist, do not silently return an incorrect SHA1. Of course, this no longer applies to git-rev-parse alone, but every user of get_sha1(). While at it, add a test. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <jun…
Paul Mackerras
Only do an update every 100 commits when drawing the graph. On a large repository with > 60,000 commits, each call to the Tk update primitive (which gives Tk a chance to respond to events and redraw the screen) was taking up to 0.2 seconds. Because the logic was to call update after drawing a commit if 0.1 seconds had passed since the last update call, we were calling it for every commit, which was slowing us down enormously. Now we also require that we …
Junio C Hamano
Merge with master. This merges commit c35a7b8d806317dc1762e36561cbd31c2530dd9c from master into our head commit edee414c3e5a546aae3dd1529f397df949713305 Sincerely, jit-merge command.
Junio C Hamano
Skip merges in format-patch.
Junio C Hamano
Add -v option to git-cherry.
Junio C Hamano
Teach git push .git/branches shorthand Although it is uncertain if we would keep .git/branches for long, the shorthand stored there can be used for pushing if it is host:path/to/git format, so let's make use of it. This does not use git-parse-remote because that script will be rewritten quite a bit for updated pulling. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
ls-remote: drop storing operation and add documentation. The store operation was never useful because we needed to fetch the objects needed to complete the reference. Remove it. The fetch command fetch multiple references shortly to replace the lost "store" functionality in more a generic way. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Teach format-patch, rebase and cherry a..b format Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Stash away the original head in ORIG_HEAD when resetting. When rewinding the head, stash away the value of the original HEAD in ORIG_HEAD, just like git-resolve-script does. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-revert: revert an existing commit. Given one existing commit, revert the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no modifications from the HEAD commit). This is based on what Linus posted to the list, with enhancements he suggested, including the use of -M to attempt reverting renames. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Introduce --pretty=oneline format. This introduces --pretty=oneline to git-rev-tree and git-rev-list commands to show only the first line of the commit message, without frills. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Document "git commit" Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-commit: log parameter updates. While moving '-m' to make room for CVS compatible "here is the log message", enhance source of log parameters. -m 'message': a command line parameter. -F <file> : a file (use '-' to read from stdin). -C <commit> : message in existing commit. -c <commit> : message in existing commit (allows further editing). Longer option names for these options are also available. While we are at it, …
Junio C Hamano
Update rev-parse flags list. I haven't audited the rev-parse users, but I am having a feeling that many of them would choke when they expect a couple of SHA1 object names and malicious user feeds them "--max-count=6" or somesuch to shoot himself in the foot. Anyway, this adds a couple of missing parameters that affect the list of revs to be returned from rev-list, not the flags that affect how they are presented by rev-list.…
Johannes Schindelin
[PATCH] add *--no-merges* flag to suppress display of merge commits As requested by Junio (who suggested --single-parents-only, but this could forget a no-parent root). Also, adds a few missing options to the usage string. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Sivak
Use GIT_SSH environment to specify alternate ssh binary. [jc: I ended up rewriting Martin's patch due to whitespace breakage, but the credit goes to Martin for doing the initial patch to identify what needs to be changed.] Signed-off-by: Martin Sivak <mars@nomi.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Small typofix in mailsplit.c Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
A bit more format warning squelching. Inspired by patch from Timo Sirainen. Most of them are not strictly necessary but making warnings less chatty would help spot real bugs later. Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Sirainen
[PATCH] -Werror fixes GCC's format __attribute__ is good for checking errors, especially with -Wformat=2 parameter. This fixes most of the reported problems against 2005-08-09 snapshot.
Pavel Roskin
[PATCH] Warning fix for gcc 4 This patch fixes the only warning reported by gcc 4.0.1 on Fedora Core 4 for x86_64: sha1_file.c:1391: warning: pointer targets in assignment differ in signedness Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge with master. This merges commit f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda from master into our head commit c3958a7926ab20b90fe0767580b466698477f5b6 Sincerely, jit-merge command.
Junio C Hamano
Merge with gitk. This merges commit b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69 from gitk into our head commit 93b5fcdd8ddaa7f55ce1a43d8b9eaed1d5febc98 Sincerely, jit-merge command.
Junio C Hamano
Downgrade git-send-email-script RPM folks have problem installing the package otherwise. Since its usefulness does have much to do with GIT, downgrade it to "contrib" status for now. We may want to move it to contrib/ subdirectory after auditing other programs when we reorganize the source tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
[PATCH] "Child" information in commit window - and cleanups This adds "Child: " lines to the commit window, which tells what children a commit has. It also cleans things up: it marks the text widget as no-wrap, which means that it doesn't need to truncate the commit description arbitrarily by hand. Also, the description itself is now done by a common helper routine that handles both the parent and the children. Signed-off-by: Linus Torvalds <torvalds@osd…
Junio C Hamano
Merge with master. This merges commit c882bc932f6702a935c748893536356b0bba11ce from master into our head commit e764a10b17610ed9b3969bdb351e09f9635eb0ab Sincerely, jit-merge command.
Chris Wright
[PATCH] Add -m <message> option to "git tag" Allow users to create a tag message by passing message on command line instead of requiring an $EDITOR session. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next