summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'np/progress'Junio C Hamano2007-11-147-93/+134
|\
| * nicer display of thin pack completionNicolas Pitre2007-11-083-11/+19
| * make display of total transferred fully accurateNicolas Pitre2007-11-071-25/+39
| * remove dead code from the csum-file interfaceNicolas Pitre2007-11-052-15/+5
| * git-fetch: be even quieter.Pierre Habouzit2007-11-051-14/+19
| * make display of total transferred more accurateNicolas Pitre2007-11-055-28/+29
| * sideband.c: ESC is spelled '\033' not '\e' for portability.Nicolas Pitre2007-11-051-1/+1
| * fix display overlap between remote and local progressNicolas Pitre2007-11-041-14/+37
* | Merge branch 'js/rebase-detached'Junio C Hamano2007-11-143-7/+79
|\ \
| * | rebase: fix "rebase --continue" breakageJohannes Schindelin2007-11-122-1/+22
| * | rebase: operate on a detached HEADJohannes Schindelin2007-11-092-6/+57
* | | Merge branch 'rs/pretty'Junio C Hamano2007-11-145-135/+284
|\ \ \
| * | | Fix preprocessor logic that determines the availablity of strchrnul().Johannes Sixt2007-11-121-1/+7
| * | | Simplify strchrnul() compat codeAndreas Ericsson2007-11-113-23/+7
| * | | --format=pretty: avoid calculating expensive expansions twiceRené Scharfe2007-11-111-0/+32
| * | | add strbuf_adddup()René Scharfe2007-11-112-0/+8
| * | | --pretty=format: parse commit message only onceRené Scharfe2007-11-111-42/+82
| * | | --pretty=format: on-demand format expansionRené Scharfe2007-11-093-123/+180
| * | | Add strchrnul()René Scharfe2007-11-094-6/+28
| |/ /
* | | Merge branch 'rr/cvsexportcommit-w'Junio C Hamano2007-11-142-17/+44
|\ \ \
| * | | cvsexportcommit: Add switch to specify CVS workdirRobin Rosenberg2007-11-012-17/+44
* | | | Merge branch 'gh/cvsimport-user'Junio C Hamano2007-11-141-1/+2
|\ \ \ \
| * | | | git-cvsimport: fix handling of user name when it is not set in CVSROOTGordon Hopper2007-11-091-1/+2
| | |/ / | |/| |
* | | | user-manual: minor rewording for clarity.Sergei Organov2007-11-141-2/+2
* | | | Merge branch 'maint'Junio C Hamano2007-11-1413-28/+66
|\ \ \ \
| * | | | git-clean: honor core.excludesfileJunio C Hamano2007-11-142-1/+19
| * | | | Documentation: Fix man page breakage with DocBook XSL v1.72Jonas Fonseca2007-11-143-3/+12
| * | | | git-remote.txt: fix typoSergei Organov2007-11-141-1/+1
| * | | | core-tutorial.txt: Fix argument mistake in an example.Sergei Organov2007-11-141-2/+2
| * | | | replace reference to git-rm with git-reset in git-commit docJing Xue2007-11-142-4/+8
| * | | | Grammar fixes for gitattributes documentationWincent Colaiuta2007-11-141-8/+9
| * | | | Don't allow fast-import tree delta chains to exceed maximum depthShawn O. Pearce2007-11-131-7/+13
| * | | | revert/cherry-pick: allow starting from dirty work tree.Junio C Hamano2007-11-131-1/+1
| * | | | t/t3404: fix test for a bogus todo file.Junio C Hamano2007-11-131-1/+1
* | | | | Fix dependencies of parse-options test programAlex Riesen2007-11-141-0/+2
* | | | | user-manual.txt: fix a few mistakesSergei Organov2007-11-141-3/+3
* | | | | Handle broken vsnprintf implementations in strbufShawn O. Pearce2007-11-142-5/+6
* | | | | Resurrect git-revert.sh example and add comment to builtin-revert.cJunio C Hamano2007-11-131-1/+3
* | | | | git-clean: Fix error message if clean.requireForce is not set.Johannes Sixt2007-11-121-10/+14
* | | | | git-svn: support for funky branch and project names over HTTP(S)Eric Wong2007-11-122-2/+62
* | | | | Documentation: Fix references to deprecated commandsJonas Fonseca2007-11-122-7/+2
* | | | | Merge branch 'maint'Junio C Hamano2007-11-125-2/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'sp/maint-plug-traverse-commit-list-leak' into maintJunio C Hamano2007-11-121-0/+7
| |\ \ \ \
| | * | | | Fix memory leak in traverse_commit_listShawn O. Pearce2007-11-101-0/+7
| * | | | | for-each-ref: fix off by one read.Christian Couder2007-11-111-1/+1
| * | | | | git-branch: remove mention of non-existent '-b' optionJeff King2007-11-111-1/+1
| * | | | | git-svn: prevent dcommitting if the index is dirty.Benoit Sigoure2007-11-112-0/+9
* | | | | | Merge branch 'js/upload-pack'Junio C Hamano2007-11-112-115/+152
|\ \ \ \ \ \
| * | | | | | upload-pack: Use finish_{command,async}() instead of waitpid().Johannes Sixt2007-11-052-115/+152
* | | | | | | Merge branch 'js/reset'Junio C Hamano2007-11-112-44/+56
|\ \ \ \ \ \ \