summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* core.prefersymlinkrefs: use symlinks for .git/HEADJunio C Hamano2006-05-026-11/+17
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-05-021-357/+1414
|\
| * gitk: Allow view to specify arbitrary arguments to git-rev-listPaul Mackerras2006-05-031-51/+196
| * gitk: Fix file list display when files are renamedPaul Mackerras2006-05-021-62/+29
| * gitk: Basic support for highlighting one view within anotherPaul Mackerras2006-05-021-221/+343
| * gitk: Add a tree-browsing modePaul Mackerras2006-05-011-20/+358
| * gitk: Use a text widget for the file listPaul Mackerras2006-04-271-59/+131
| * Merge branch 'new'Paul Mackerras2006-04-261-156/+555
| |\
| | * gitk: add menu item for editing the current viewPaul Mackerras2006-04-251-37/+90
| | * gitk: Implement "permanent" views (stored in ~/.gitk)Paul Mackerras2006-04-251-13/+48
| | * Merge branch 'master' into newPaul Mackerras2006-04-231-2/+3
| | |\
| | * | gitk: Use git-rev-parse only to identify file/dir names on cmd linePaul Mackerras2006-04-231-50/+23
| | * | gitk: Remember the view in the history listPaul Mackerras2006-04-211-9/+29
| | * | gitk: Don't reread git-rev-list output from scratch on view switchPaul Mackerras2006-04-171-41/+116
| | * | gitk: Fix various bugs in the view supportPaul Mackerras2006-04-061-5/+15
| | * | Merge branch 'master' into newPaul Mackerras2006-04-061-14/+131
| | |\ \
| | * | | gitk: Make File->Update work properly againPaul Mackerras2006-04-061-29/+30
| | * | | gitk: Implement multiple viewsPaul Mackerras2006-04-041-118/+334
| * | | | [PATCH] gitk: Add a visual tag for remote refsJosef Weidendorfer2006-04-251-0/+14
| | |_|/ | |/| |
* | | | Merge branch 'fix'Junio C Hamano2006-05-022-4/+31
|\ \ \ \
| * | | | git-send-email: fix version string to be valid perlMartin Langhoff2006-05-021-1/+8
| * | | | Give the user a hint for how to continue in the case that git-am fails becaus...Robert Shearman2006-05-021-3/+23
* | | | | repo-config: trim white-space before commentJohannes Schindelin2006-05-021-6/+6
* | | | | repo-config: fix segfault with no argument.Johannes Schindelin2006-05-021-3/+2
* | | | | Merge branch 'jc/xsha1-2'Junio C Hamano2006-05-011-0/+37
|\ \ \ \ \
| * | | | | Extended SHA1 -- "rev^@" syntax to mean "all parents"Junio C Hamano2006-04-301-0/+37
* | | | | | Merge branch 'jc/pack'Junio C Hamano2006-05-011-6/+6
|\ \ \ \ \ \
| * | | | | | pack-objects: update size heuristucs.Junio C Hamano2006-04-271-6/+6
* | | | | | | Merge branch 'jc/pathcheck'Junio C Hamano2006-05-013-3/+36
|\ \ \ \ \ \ \
| * | | | | | | revision parsing: make "rev -- paths" checks stronger.Junio C Hamano2006-04-263-3/+36
* | | | | | | | Merge branch 'nh/fetch-http'Junio C Hamano2006-05-011-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | git-fetch: resolve remote symrefs for HTTP transportNick Hengeveld2006-04-261-4/+12
| |/ / / / / / /
* | | | | | | | Merge branch 'se/rebase'Junio C Hamano2006-05-012-37/+101
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add --continue and --abort options to git-rebase.sean2006-04-262-37/+101
| |/ / / / / /
* | | | | | | Merge branch 'fix'Junio C Hamano2006-04-301-5/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | git-format-patch: Use rfc2822 compliant date.Huw Davies2006-04-301-5/+4
* | | | | | | Merge branch 'fix'Junio C Hamano2006-04-2813-135/+178
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Fix trivial typo in git-log man page.Sean Estabrooks2006-04-281-4/+3
| * | | | | Properly render asciidoc "callouts" in git man pages.Sean Estabrooks2006-04-282-1/+17
| * | | | | Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks2006-04-286-108/+104
| * | | | | Update the git-branch man page to include the "-r" option,Sean Estabrooks2006-04-282-19/+40
| * | | | | annotate: display usage information if no filename was givenMatthias Kestenholz2006-04-281-3/+4
| * | | | | annotate: fix warning about uninitialized scalarMatthias Kestenholz2006-04-281-0/+3
| * | | | | git-am --resolved: more usable error message.Junio C Hamano2006-04-281-0/+7
* | | | | | Merge branch 'fix'Junio C Hamano2006-04-271-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | verify-pack: check integrity in a saner order.Junio C Hamano2006-04-271-3/+3
* | | | | | Merge branch 'pb/config'Junio C Hamano2006-04-274-13/+30
|\ \ \ \ \ \
| * | | | | | git-cvsserver: typofixesJunio C Hamano2006-04-251-8/+8
| * | | | | | Deprecate usage of git-var -l for getting config vars listPetr Baudis2006-04-242-4/+5
| * | | | | | git-repo-config --list supportPetr Baudis2006-04-242-2/+18