Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | blame: correctly handle a path that used to be a directory | Junio C Hamano | 2009-06-03 | 2 | -8/+33 | |
| * | | | | | | add -i: do not dump patch during application | Thomas Rast | 2009-06-03 | 1 | -1/+0 | |
| * | | | | | | Update draft release notes for 1.6.3.2 | Junio C Hamano | 2009-06-02 | 1 | -14/+26 | |
| * | | | | | | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint | Junio C Hamano | 2009-06-02 | 2 | -16/+21 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Change xdl_merge to generate output even for null merges | Charles Bailey | 2009-05-24 | 2 | -17/+16 | |
| | * | | | | | | t6023: merge-file fails to output anything for a degenerate merge | Charles Bailey | 2009-05-24 | 1 | -0/+6 | |
| * | | | | | | | Merge branch 'rs/maint-grep-word-regexp-fix' into maint | Junio C Hamano | 2009-06-02 | 2 | -1/+11 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | grep: fix colouring of matches with zero length | René Scharfe | 2009-06-01 | 1 | -0/+2 | |
| * | | | | | | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint | Junio C Hamano | 2009-06-02 | 6 | -0/+93 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-add-p-coalesce-fix' into maint | Junio C Hamano | 2009-06-02 | 2 | -1/+133 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-doc-stash-pop' into maint | Junio C Hamano | 2009-06-02 | 2 | -16/+18 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Documentation: teach stash/pop workflow instead of stash/apply | Thomas Rast | 2009-05-28 | 2 | -16/+18 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
* | | | | | | | | | | test-lib: fix http exit codes | Clemens Buchacher | 2009-06-01 | 1 | -2/+4 | |
* | | | | | | | | | | test-lib: allow exit trap to be used for cleanup by tests | Clemens Buchacher | 2009-06-01 | 1 | -7/+14 | |
* | | | | | | | | | | test-lib: fail if invalid options are passed | Clemens Buchacher | 2009-06-01 | 1 | -1/+1 | |
* | | | | | | | | | | git-show-branch.txt: document --date-order option | Stephen Boyd | 2009-06-01 | 1 | -3/+9 | |
* | | | | | | | | | | Merge branch 'sb/opt-filename' | Junio C Hamano | 2009-05-31 | 52 | -96/+144 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | parse-opts: add OPT_FILENAME and transition builtins | Stephen Boyd | 2009-05-25 | 9 | -33/+59 | |
| * | | | | | | | | | | parse-opts: prepare for OPT_FILENAME | Stephen Boyd | 2009-05-25 | 51 | -64/+86 | |
| * | | | | | | | | | | Merge branch 'jc/mktree' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 7 | -135/+280 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/format-patch-parseopt' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 1 | -100/+160 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/show-branch-parse-options' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 3 | -71/+84 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 448 | -6304/+16187 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jc/solaris-0811' | Junio C Hamano | 2009-05-31 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV | Junio C Hamano | 2009-05-22 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6 | Junio C Hamano | 2009-05-22 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'sb/show-branch-parse-options' | Junio C Hamano | 2009-05-31 | 3 | -71/+84 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | show-branch: migrate to parse-options API | Stephen Boyd | 2009-05-22 | 1 | -62/+63 | |
| * | | | | | | | | | | | | | | Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options | Junio C Hamano | 2009-05-22 | 4 | -5/+66 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's | Stephen Boyd | 2009-05-22 | 2 | -9/+21 | |
* | | | | | | | | | | | | | | | | Merge branch 'mm/apply-double-slash' | Junio C Hamano | 2009-05-31 | 1 | -6/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | apply: handle filenames with double slashes better | Michal Marek | 2009-05-24 | 1 | -6/+20 | |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/format-patch-parseopt' | Junio C Hamano | 2009-05-31 | 1 | -100/+160 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | format-patch: migrate to parse-options API | Stephen Boyd | 2009-05-17 | 1 | -97/+158 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/mktree' | Junio C Hamano | 2009-05-31 | 7 | -135/+280 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | mktree: validate entry type in input | Josh Micich | 2009-05-16 | 1 | -10/+33 | |
| * | | | | | | | | | | | | | | | | mktree --batch: build more than one tree object | Josh Micich | 2009-05-16 | 2 | -8/+40 | |
| * | | | | | | | | | | | | | | | | mktree --missing: updated usage message and man page | Josh Micich | 2009-05-16 | 2 | -4/+11 | |
| * | | | | | | | | | | | | | | | | mktree --missing: allow missing objects | Junio C Hamano | 2009-05-10 | 2 | -4/+19 | |
| * | | | | | | | | | | | | | | | | t1010: add mktree test | Junio C Hamano | 2009-05-10 | 1 | -0/+61 | |
| * | | | | | | | | | | | | | | | | mktree: do not barf on a submodule commit | Junio C Hamano | 2009-05-10 | 1 | -1/+8 | |
| * | | | | | | | | | | | | | | | | builtin-mktree.c: use a helper function to handle one line of input | Junio C Hamano | 2009-05-10 | 1 | -40/+42 | |
| * | | | | | | | | | | | | | | | | mktree: use parse-options | Junio C Hamano | 2009-05-10 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | | | | build-in git-mktree | Junio C Hamano | 2009-05-10 | 4 | -12/+10 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ew/svn-test-and-old-i18n' | Junio C Hamano | 2009-05-31 | 17 | -93/+91 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | t9139 uses ancient, backwards-compatible iconv names | Eric Wong | 2009-05-30 | 17 | -93/+91 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | t8005: fix typo, it's ISO-8859-5, not KOI8-R | Brandon Casey | 2009-05-27 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | t8005: convert CP1251 character set to ISO8859-5 | Brandon Casey | 2009-05-22 | 3 | -15/+15 | |
| | * | | | | | | | | | | | | | | | | | t8005: use more portable character encoding names | Brandon Casey | 2009-05-22 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | t5100: use ancient encoding syntax for backwards compatibility | Brandon Casey | 2009-05-18 | 2 | -20/+20 |