summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-add-sync-stat'Junio C Hamano2007-11-1410-38/+92
|\
| * t2200: test more cases of "add -u"Junio C Hamano2007-11-111-2/+28
| * git-add: make the entry stat-clean after re-adding the same contentsJunio C Hamano2007-11-104-3/+8
| * ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano2007-11-108-34/+57
* | Merge branch 'mh/retag'Junio C Hamano2007-11-142-3/+51
|\ \
| * | Add tests for git tagMike Hommey2007-11-051-0/+16
| * | Reuse previous annotation when overwriting a tagMike Hommey2007-11-051-3/+35
* | | Merge branch 'jc/stash-create'Junio C Hamano2007-11-142-14/+31
|\ \ \
| * | | git-stash: Fix listing stashesEmil Medve2007-11-071-1/+5
| * | | git-merge: no reason to use cpio anymoreJunio C Hamano2007-11-011-6/+5
| * | | Revert "rebase: allow starting from a dirty tree."Junio C Hamano2007-11-011-58/+14
| * | | rebase: allow starting from a dirty tree.Junio C Hamano2007-09-141-14/+58
| * | | stash: implement "stash create"Junio C Hamano2007-09-141-7/+21
* | | | Merge branch 'bg/format-patch-N'Junio C Hamano2007-11-144-5/+139
|\ \ \ \
| * | | | Rearrange git-format-patch synopsis to improve clarity.David Symonds2007-11-051-1/+2
| * | | | format-patch: Test --[no-]numbered and format.numberedBrian Gernhardt2007-11-041-0/+106
| * | | | format-patch: Add configuration and off switch for --numberedBrian Gernhardt2007-11-043-5/+32
* | | | | 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