Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | rebase: refactor reading of state | Martin von Zweigbergk | 2011-02-10 | 1 | -30/+23 | |
| * | | | | | rebase: clearer names for directory variables | Martin von Zweigbergk | 2011-02-10 | 1 | -70/+71 | |
* | | | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2011-04-28 | 2 | -6/+81 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | merge-recursive: tweak magic band-aid | Junio C Hamano | 2011-03-17 | 1 | -1/+8 | |
| * | | | | | | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-03-02 | 2 | -7/+12 | |
| * | | | | | | t6022: New test checking for unnecessary updates of files in D/F conflicts | Elijah Newren | 2011-03-02 | 1 | -0/+33 | |
| * | | | | | | t6022: New test checking for unnecessary updates of renamed+modified files | Elijah Newren | 2011-03-02 | 1 | -0/+30 | |
* | | | | | | | Merge branch 'jh/dirstat' | Junio C Hamano | 2011-04-28 | 8 | -12/+81 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | --dirstat: In case of renames, use target filename instead of source filename | Johan Herland | 2011-04-12 | 1 | -1/+1 | |
| * | | | | | | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 | 4 | -5/+21 | |
| * | | | | | | | --dirstat-by-file: Make it faster and more correct | Johan Herland | 2011-04-11 | 3 | -5/+25 | |
| * | | | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diff | Johan Herland | 2011-04-11 | 6 | -7/+40 | |
* | | | | | | | | Merge branch 'sp/maint-clear-postfields' | Junio C Hamano | 2011-04-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | http: clear POSTFIELDS when initializing a slot | Junio C Hamano | 2011-04-26 | 1 | -0/+1 | |
* | | | | | | | | | Start 1.7.6 cycle | Junio C Hamano | 2011-04-27 | 3 | -2/+81 | |
* | | | | | | | | | Merge branch 'mg/x-years-12-months' | Junio C Hamano | 2011-04-27 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | date: avoid "X years, 12 months" in relative dates | Michael J Gruber | 2011-04-20 | 2 | -2/+4 | |
* | | | | | | | | | Merge branch 'cn/format-patch-quiet' | Junio C Hamano | 2011-04-27 | 2 | -7/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | format-patch: document --quiet option | Carlos Martín Nieto | 2011-04-12 | 1 | -1/+4 | |
| * | | | | | | | | | format-patch: don't pass on the --quiet flag | Carlos Martín Nieto | 2011-04-12 | 1 | -6/+10 | |
* | | | | | | | | | | Merge branch 'ef/maint-strbuf-init' | Junio C Hamano | 2011-04-27 | 3 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | config: support values longer than 1023 bytes | Erik Faye-Lund | 2011-04-11 | 2 | -11/+9 | |
| * | | | | | | | | | | strbuf: make sure buffer is zero-terminated | Erik Faye-Lund | 2011-04-11 | 1 | -1/+3 | |
* | | | | | | | | | | | Merge branch 'rr/doc-content-type' | Junio C Hamano | 2011-04-27 | 2 | -62/+103 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Documentation: Allow custom diff tools to be specified in 'diff.tool' | Ramkumar Ramachandra | 2011-04-06 | 1 | -6/+8 | |
| * | | | | | | | | | | | Documentation: Add diff.<driver>.* to config | Ramkumar Ramachandra | 2011-04-06 | 1 | -0/+28 | |
| * | | | | | | | | | | | Documentation: Move diff.<driver>.* from config.txt to diff-config.txt | Ramkumar Ramachandra | 2011-04-06 | 2 | -62/+63 | |
| * | | | | | | | | | | | Documentation: Add filter.<driver>.* to config | Ramkumar Ramachandra | 2011-04-06 | 1 | -0/+10 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jc/merge-dash-previous' | Junio C Hamano | 2011-04-27 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | merge: allow "-" as a short-hand for "previous branch" | Junio C Hamano | 2011-04-07 | 1 | -3/+6 | |
* | | | | | | | | | | | | Merge branch 'dm/stash-k-i-p' | Junio C Hamano | 2011-04-27 | 3 | -4/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any order | Dan McGee | 2011-04-07 | 2 | -5/+6 | |
| * | | | | | | | | | | | | stash: add two more tests for --no-keep-index | Dan McGee | 2011-04-07 | 2 | -0/+20 | |
* | | | | | | | | | | | | | Merge branch 'rj/sparse' | Junio C Hamano | 2011-04-27 | 10 | -30/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | sparse: Fix some "symbol not declared" warnings | Ramsay Jones | 2011-04-22 | 2 | -2/+3 | |
| * | | | | | | | | | | | | | sparse: Fix errors due to missing target-specific variables | Ramsay Jones | 2011-04-22 | 1 | -17/+28 | |
| * | | | | | | | | | | | | | sparse: Fix an "symbol 'merge_file' not decared" warning | Ramsay Jones | 2011-04-11 | 4 | -2/+10 | |
| * | | | | | | | | | | | | | sparse: Fix an "symbol 'format_subject' not declared" warning | Ramsay Jones | 2011-04-11 | 2 | -3/+2 | |
| * | | | | | | | | | | | | | sparse: Fix some "Using plain integer as NULL pointer" warnings | Ramsay Jones | 2011-04-11 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | sparse: Fix an "symbol 'cmd_index_pack' not declared" warning | Ramsay Jones | 2011-04-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Makefile: Use cgcc rather than sparse in the check target | Ramsay Jones | 2011-04-11 | 1 | -5/+6 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/maint-upload-pack-shallow' | Junio C Hamano | 2011-04-27 | 1 | -12/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | upload-pack: start pack-objects before async rev-list | Jeff King | 2011-04-06 | 1 | -12/+11 | |
* | | | | | | | | | | | | | | Merge branch 'nk/blame-abbrev' | Junio C Hamano | 2011-04-27 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | blame: add --abbrev command line option and make it honor core.abbrev | Namhyung Kim | 2011-04-05 | 2 | -2/+14 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/maint-stash-oob' | Junio C Hamano | 2011-04-27 | 2 | -16/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | stash: fix false positive in the invalid ref test. | Jon Seymour | 2011-04-05 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | stash: fix accidental apply of non-existent stashes | Jeff King | 2011-04-05 | 2 | -11/+7 | |
* | | | | | | | | | | | | | | | Merge branch 'dm/color-palette' | Junio C Hamano | 2011-04-27 | 4 | -35/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Share color list between graph and show-branch | Dan McGee | 2011-04-04 | 4 | -35/+29 |