mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'zj/diff-stat-smaller-num-columns'
Spend only minimum number of columns necessary to show the number of lines in the output from "diff --stat", instead of always allocating 4 columns even when showing changes that are much smaller than 1000 lines. By Zbigniew Jędrzejewski-Szmek * zj/diff-stat-smaller-num-columns: diff --stat: use less columns for change counts
This commit is contained in:
commit
29c2a3dbad
|
@ -1002,8 +1002,8 @@ would be different)
|
||||||
----------------
|
----------------
|
||||||
Updating from ae3a2da... to a80b4aa....
|
Updating from ae3a2da... to a80b4aa....
|
||||||
Fast-forward (no commit created; -m option ignored)
|
Fast-forward (no commit created; -m option ignored)
|
||||||
example | 1 +
|
example | 1 +
|
||||||
hello | 1 +
|
hello | 1 +
|
||||||
2 files changed, 2 insertions(+)
|
2 files changed, 2 insertions(+)
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
|
|
48
diff.c
48
diff.c
|
@ -1443,8 +1443,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
{
|
{
|
||||||
int i, len, add, del, adds = 0, dels = 0;
|
int i, len, add, del, adds = 0, dels = 0;
|
||||||
uintmax_t max_change = 0, max_len = 0;
|
uintmax_t max_change = 0, max_len = 0;
|
||||||
int total_files = data->nr;
|
int total_files = data->nr, count;
|
||||||
int width, name_width, graph_width, number_width = 4, count;
|
int width, name_width, graph_width, number_width = 0, bin_width = 0;
|
||||||
const char *reset, *add_c, *del_c;
|
const char *reset, *add_c, *del_c;
|
||||||
const char *line_prefix = "";
|
const char *line_prefix = "";
|
||||||
int extra_shown = 0;
|
int extra_shown = 0;
|
||||||
|
@ -1480,8 +1480,21 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
if (max_len < len)
|
if (max_len < len)
|
||||||
max_len = len;
|
max_len = len;
|
||||||
|
|
||||||
if (file->is_binary || file->is_unmerged)
|
if (file->is_unmerged) {
|
||||||
|
/* "Unmerged" is 8 characters */
|
||||||
|
bin_width = bin_width < 8 ? 8 : bin_width;
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
if (file->is_binary) {
|
||||||
|
/* "Bin XXX -> YYY bytes" */
|
||||||
|
int w = 14 + decimal_width(file->added)
|
||||||
|
+ decimal_width(file->deleted);
|
||||||
|
bin_width = bin_width < w ? w : bin_width;
|
||||||
|
/* Display change counts aligned with "Bin" */
|
||||||
|
number_width = 3;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (max_change < change)
|
if (max_change < change)
|
||||||
max_change = change;
|
max_change = change;
|
||||||
}
|
}
|
||||||
|
@ -1506,12 +1519,22 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
* stat_name_width fixes the maximum width of the filename,
|
* stat_name_width fixes the maximum width of the filename,
|
||||||
* and is also used to divide available columns if there
|
* and is also used to divide available columns if there
|
||||||
* aren't enough.
|
* aren't enough.
|
||||||
|
*
|
||||||
|
* Binary files are displayed with "Bin XXX -> YYY bytes"
|
||||||
|
* instead of the change count and graph. This part is treated
|
||||||
|
* similarly to the graph part, except that it is not
|
||||||
|
* "scaled". If total width is too small to accomodate the
|
||||||
|
* guaranteed minimum width of the filename part and the
|
||||||
|
* separators and this message, this message will "overflow"
|
||||||
|
* making the line longer than the maximum width.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (options->stat_width == -1)
|
if (options->stat_width == -1)
|
||||||
width = term_columns() - options->output_prefix_length;
|
width = term_columns() - options->output_prefix_length;
|
||||||
else
|
else
|
||||||
width = options->stat_width ? options->stat_width : 80;
|
width = options->stat_width ? options->stat_width : 80;
|
||||||
|
number_width = decimal_width(max_change) > number_width ?
|
||||||
|
decimal_width(max_change) : number_width;
|
||||||
|
|
||||||
if (options->stat_graph_width == -1)
|
if (options->stat_graph_width == -1)
|
||||||
options->stat_graph_width = diff_stat_graph_width;
|
options->stat_graph_width = diff_stat_graph_width;
|
||||||
|
@ -1525,10 +1548,14 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* First assign sizes that are wanted, ignoring available width.
|
* First assign sizes that are wanted, ignoring available width.
|
||||||
|
* strlen("Bin XXX -> YYY bytes") == bin_width, and the part
|
||||||
|
* starting from "XXX" should fit in graph_width.
|
||||||
*/
|
*/
|
||||||
graph_width = (options->stat_graph_width &&
|
graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
|
||||||
options->stat_graph_width < max_change) ?
|
if (options->stat_graph_width &&
|
||||||
options->stat_graph_width : max_change;
|
options->stat_graph_width < graph_width)
|
||||||
|
graph_width = options->stat_graph_width;
|
||||||
|
|
||||||
name_width = (options->stat_name_width > 0 &&
|
name_width = (options->stat_name_width > 0 &&
|
||||||
options->stat_name_width < max_len) ?
|
options->stat_name_width < max_len) ?
|
||||||
options->stat_name_width : max_len;
|
options->stat_name_width : max_len;
|
||||||
|
@ -1587,7 +1614,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
if (data->files[i]->is_binary) {
|
if (data->files[i]->is_binary) {
|
||||||
fprintf(options->file, "%s", line_prefix);
|
fprintf(options->file, "%s", line_prefix);
|
||||||
show_name(options->file, prefix, name, len);
|
show_name(options->file, prefix, name, len);
|
||||||
fprintf(options->file, " Bin ");
|
fprintf(options->file, " %*s ", number_width, "Bin");
|
||||||
fprintf(options->file, "%s%"PRIuMAX"%s",
|
fprintf(options->file, "%s%"PRIuMAX"%s",
|
||||||
del_c, deleted, reset);
|
del_c, deleted, reset);
|
||||||
fprintf(options->file, " -> ");
|
fprintf(options->file, " -> ");
|
||||||
|
@ -1600,7 +1627,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
else if (data->files[i]->is_unmerged) {
|
else if (data->files[i]->is_unmerged) {
|
||||||
fprintf(options->file, "%s", line_prefix);
|
fprintf(options->file, "%s", line_prefix);
|
||||||
show_name(options->file, prefix, name, len);
|
show_name(options->file, prefix, name, len);
|
||||||
fprintf(options->file, " Unmerged\n");
|
fprintf(options->file, " Unmerged\n");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1629,8 +1656,9 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||||
}
|
}
|
||||||
fprintf(options->file, "%s", line_prefix);
|
fprintf(options->file, "%s", line_prefix);
|
||||||
show_name(options->file, prefix, name, len);
|
show_name(options->file, prefix, name, len);
|
||||||
fprintf(options->file, "%5"PRIuMAX"%s", added + deleted,
|
fprintf(options->file, " %*"PRIuMAX"%s",
|
||||||
added + deleted ? " " : "");
|
number_width, added + deleted,
|
||||||
|
added + deleted ? " " : "");
|
||||||
show_graph(options->file, '+', add, add_c, reset);
|
show_graph(options->file, '+', add, add_c, reset);
|
||||||
show_graph(options->file, '-', del, del_c, reset);
|
show_graph(options->file, '-', del, del_c, reset);
|
||||||
fprintf(options->file, "\n");
|
fprintf(options->file, "\n");
|
||||||
|
|
|
@ -11,7 +11,7 @@ Date: Thu, 23 Aug 2007 13:00:00 +0200
|
||||||
Subject: test1
|
Subject: test1
|
||||||
|
|
||||||
---
|
---
|
||||||
foo | 1 +
|
foo | 1 +
|
||||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||||
create mode 100644 foo
|
create mode 100644 foo
|
||||||
|
|
||||||
|
|
|
@ -154,8 +154,8 @@ test_expect_success 'git show-branch' '
|
||||||
cat > resolve.expect << EOF
|
cat > resolve.expect << EOF
|
||||||
Updating VARIABLE..VARIABLE
|
Updating VARIABLE..VARIABLE
|
||||||
FASTFORWARD (no commit created; -m option ignored)
|
FASTFORWARD (no commit created; -m option ignored)
|
||||||
example | 1 +
|
example | 1 +
|
||||||
hello | 1 +
|
hello | 1 +
|
||||||
2 files changed, 2 insertions(+)
|
2 files changed, 2 insertions(+)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -323,7 +323,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
|
||||||
echo resolved > file1 &&
|
echo resolved > file1 &&
|
||||||
git add file1 &&
|
git add file1 &&
|
||||||
git rebase --continue > output &&
|
git rebase --continue > output &&
|
||||||
grep "^ file1 | 2 +-$" output
|
grep "^ file1 | 2 +-$" output
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'multi-squash only fires up editor once' '
|
test_expect_success 'multi-squash only fires up editor once' '
|
||||||
|
|
|
@ -443,7 +443,7 @@ test_expect_success 'stash show format defaults to --stat' '
|
||||||
STASH_ID=$(git stash create) &&
|
STASH_ID=$(git stash create) &&
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
cat >expected <<-EOF &&
|
cat >expected <<-EOF &&
|
||||||
file | 1 +
|
file | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
EOF
|
EOF
|
||||||
git stash show ${STASH_ID} >actual &&
|
git stash show ${STASH_ID} >actual &&
|
||||||
|
|
|
@ -107,4 +107,23 @@ test_expect_success 'diff --no-index with binary creation' '
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
cat >expect <<EOF
|
||||||
|
binfile | Bin 0 -> 1026 bytes
|
||||||
|
textfile | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_expect_success 'diff --stat with binary files and big change count' '
|
||||||
|
echo X | dd of=binfile bs=1k seek=1 &&
|
||||||
|
git add binfile &&
|
||||||
|
i=0 &&
|
||||||
|
while test $i -lt 10000; do
|
||||||
|
echo $i &&
|
||||||
|
i=$(($i + 1))
|
||||||
|
done >textfile &&
|
||||||
|
git add textfile &&
|
||||||
|
git diff --cached --stat binfile textfile >output &&
|
||||||
|
grep " | " output >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
$ git diff-tree --cc --patch-with-stat --summary master
|
$ git diff-tree --cc --patch-with-stat --summary master
|
||||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --cc dir/sub
|
diff --cc dir/sub
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
$ git diff-tree --cc --patch-with-stat --summary side
|
$ git diff-tree --cc --patch-with-stat --summary side
|
||||||
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
$ git diff-tree --cc --patch-with-stat master
|
$ git diff-tree --cc --patch-with-stat master
|
||||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --cc dir/sub
|
diff --cc dir/sub
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
$ git diff-tree --cc --stat --summary master
|
$ git diff-tree --cc --stat --summary master
|
||||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
$ git diff-tree --cc --stat --summary side
|
$ git diff-tree --cc --stat --summary side
|
||||||
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
$ git diff-tree --cc --stat master
|
$ git diff-tree --cc --stat master
|
||||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
$ git diff-tree --pretty=oneline --root --patch-with-stat initial
|
$ git diff-tree --pretty=oneline --root --patch-with-stat initial
|
||||||
444ac553ac7612cc88969031b02b3767fb8a353a Initial
|
444ac553ac7612cc88969031b02b3767fb8a353a Initial
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -5,8 +5,8 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
$ git diff-tree --root --patch-with-stat initial
|
$ git diff-tree --root --patch-with-stat initial
|
||||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
$ git diff-tree -c --stat --summary master
|
$ git diff-tree -c --stat --summary master
|
||||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
$ git diff-tree -c --stat --summary side
|
$ git diff-tree -c --stat --summary side
|
||||||
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
$ git diff-tree -c --stat master
|
$ git diff-tree -c --stat master
|
||||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
$ git diff --patch-with-stat -r initial..side
|
$ git diff --patch-with-stat -r initial..side
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
$ git diff --patch-with-stat initial..side
|
$ git diff --patch-with-stat initial..side
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
$ git diff --stat initial..side
|
$ git diff --stat initial..side
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
$ git diff -r --stat initial..side
|
$ git diff -r --stat initial..side
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,10 @@ A U Thor (2):
|
||||||
Second
|
Second
|
||||||
Third
|
Third
|
||||||
|
|
||||||
dir/sub | 4 ++++
|
dir/sub | 4 ++++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
4 files changed, 10 insertions(+), 3 deletions(-)
|
4 files changed, 10 insertions(+), 3 deletions(-)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
@ -28,9 +28,9 @@ Subject: [DIFFERENT_PREFIX 1/2] Second
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
|
||||||
Subject: [DIFFERENT_PREFIX 2/2] Third
|
Subject: [DIFFERENT_PREFIX 2/2] Third
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@ Subject: [PATCH] Second
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
|
||||||
Subject: [PATCH] Third
|
Subject: [PATCH] Third
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
|
||||||
Subject: [PATCH] Side
|
Subject: [PATCH] Side
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@ Subject: [PATCH 1/3] Second
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
|
||||||
Subject: [PATCH 2/3] Third
|
Subject: [PATCH 2/3] Third
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
|
||||||
Subject: [PATCH 3/3] Side
|
Subject: [PATCH 3/3] Side
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@ Subject: [PATCH 1/3] Second
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
|
||||||
Subject: [PATCH 2/3] Third
|
Subject: [PATCH 2/3] Third
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
|
||||||
Subject: [PATCH 3/3] Side
|
Subject: [PATCH 3/3] Side
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@ Subject: [PATCH 1/2] Second
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
|
||||||
Subject: [PATCH 2/2] Third
|
Subject: [PATCH 2/2] Third
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
|
||||||
Subject: [PATCH] Side
|
Subject: [PATCH] Side
|
||||||
|
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -31,7 +31,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -53,7 +53,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -12,9 +12,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -54,8 +54,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -86,9 +86,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -12,7 +12,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -31,7 +31,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -53,7 +53,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -6,8 +6,8 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||||
|
|
||||||
Merge branch 'side'
|
Merge branch 'side'
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --cc dir/sub
|
diff --cc dir/sub
|
||||||
|
@ -44,9 +44,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
@ -87,8 +87,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -120,9 +120,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -162,9 +162,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -12,9 +12,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
@ -55,8 +55,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -88,9 +88,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -130,9 +130,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -12,9 +12,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -54,8 +54,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -86,9 +86,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -127,9 +127,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -6,8 +6,8 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||||
|
|
||||||
Merge branch 'side'
|
Merge branch 'side'
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --combined dir/sub
|
diff --combined dir/sub
|
||||||
|
@ -44,9 +44,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
@ -87,8 +87,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -120,9 +120,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -162,9 +162,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
$
|
$
|
||||||
|
|
|
@ -5,8 +5,8 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
$
|
$
|
||||||
|
|
|
@ -5,7 +5,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -24,7 +24,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -46,7 +46,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -47,8 +47,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -79,9 +79,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -5,7 +5,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -24,7 +24,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -46,7 +46,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -6,8 +6,8 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||||
|
|
||||||
Merge branch 'side'
|
Merge branch 'side'
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --cc dir/sub
|
diff --cc dir/sub
|
||||||
|
@ -44,9 +44,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
@ -87,8 +87,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -120,9 +120,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -162,9 +162,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
@ -48,8 +48,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -81,9 +81,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -123,9 +123,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -5,9 +5,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -47,8 +47,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -79,9 +79,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -120,9 +120,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
|
|
@ -6,8 +6,8 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||||
|
|
||||||
Merge branch 'side'
|
Merge branch 'side'
|
||||||
|
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --combined dir/sub
|
diff --combined dir/sub
|
||||||
|
@ -44,9 +44,9 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||||
|
|
||||||
Side
|
Side
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file3 | 4 ++++
|
file3 | 4 ++++
|
||||||
3 files changed, 9 insertions(+)
|
3 files changed, 9 insertions(+)
|
||||||
create mode 100644 file3
|
create mode 100644 file3
|
||||||
|
|
||||||
|
@ -87,8 +87,8 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||||
|
|
||||||
Third
|
Third
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file1 | 3 +++
|
file1 | 3 +++
|
||||||
2 files changed, 5 insertions(+)
|
2 files changed, 5 insertions(+)
|
||||||
create mode 100644 file1
|
create mode 100644 file1
|
||||||
|
|
||||||
|
@ -120,9 +120,9 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||||
|
|
||||||
This is the second commit.
|
This is the second commit.
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 ---
|
file2 | 3 ---
|
||||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
delete mode 100644 file2
|
delete mode 100644 file2
|
||||||
|
|
||||||
|
@ -162,9 +162,9 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||||
|
|
||||||
Initial
|
Initial
|
||||||
---
|
---
|
||||||
dir/sub | 2 ++
|
dir/sub | 2 ++
|
||||||
file0 | 3 +++
|
file0 | 3 +++
|
||||||
file2 | 3 +++
|
file2 | 3 +++
|
||||||
3 files changed, 8 insertions(+)
|
3 files changed, 8 insertions(+)
|
||||||
create mode 100644 dir/sub
|
create mode 100644 dir/sub
|
||||||
create mode 100644 file0
|
create mode 100644 file0
|
||||||
|
|
|
@ -73,13 +73,13 @@ test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' '
|
||||||
|
|
||||||
test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
|
test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
|
||||||
cat >expect <<-\EOF &&
|
cat >expect <<-\EOF &&
|
||||||
pathname.1 => "Rpathname\twith HT.0" | 0
|
pathname.1 => "Rpathname\twith HT.0" | 0
|
||||||
pathname.3 => "Rpathname\nwith LF.0" | 0
|
pathname.3 => "Rpathname\nwith LF.0" | 0
|
||||||
"pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
|
"pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
|
||||||
pathname.2 => Rpathname with SP.0 | 0
|
pathname.2 => Rpathname with SP.0 | 0
|
||||||
"pathname\twith HT.2" => Rpathname with SP.1 | 0
|
"pathname\twith HT.2" => Rpathname with SP.1 | 0
|
||||||
pathname.0 => Rpathname.0 | 0
|
pathname.0 => Rpathname.0 | 0
|
||||||
"pathname\twith HT.0" => Rpathname.1 | 0
|
"pathname\twith HT.0" => Rpathname.1 | 0
|
||||||
7 files changed, 0 insertions(+), 0 deletions(-)
|
7 files changed, 0 insertions(+), 0 deletions(-)
|
||||||
EOF
|
EOF
|
||||||
git diff --stat -M HEAD >actual &&
|
git diff --stat -M HEAD >actual &&
|
||||||
|
|
|
@ -85,7 +85,7 @@ test_expect_success 'status -v produces text' '
|
||||||
'
|
'
|
||||||
|
|
||||||
cat >expect.stat <<'EOF'
|
cat >expect.stat <<'EOF'
|
||||||
file | Bin 2 -> 4 bytes
|
file | Bin 2 -> 4 bytes
|
||||||
1 file changed, 0 insertions(+), 0 deletions(-)
|
1 file changed, 0 insertions(+), 0 deletions(-)
|
||||||
EOF
|
EOF
|
||||||
test_expect_success 'diffstat does not run textconv' '
|
test_expect_success 'diffstat does not run textconv' '
|
||||||
|
|
|
@ -44,7 +44,7 @@ test_expect_success "--numstat $*" "
|
||||||
check_stat() {
|
check_stat() {
|
||||||
expect=$1; shift
|
expect=$1; shift
|
||||||
cat >expected <<EOF
|
cat >expected <<EOF
|
||||||
$expect | 1 +
|
$expect | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
EOF
|
EOF
|
||||||
test_expect_success "--stat $*" "
|
test_expect_success "--stat $*" "
|
||||||
|
|
|
@ -14,8 +14,8 @@ test_expect_success setup '
|
||||||
echo a >a &&
|
echo a >a &&
|
||||||
echo b >b &&
|
echo b >b &&
|
||||||
cat >expect <<-\EOF
|
cat >expect <<-\EOF
|
||||||
a | 1 +
|
a | 1 +
|
||||||
b | 1 +
|
b | 1 +
|
||||||
2 files changed, 2 insertions(+)
|
2 files changed, 2 insertions(+)
|
||||||
EOF
|
EOF
|
||||||
git diff --stat --stat-count=2 >actual &&
|
git diff --stat --stat-count=2 >actual &&
|
||||||
|
|
|
@ -22,7 +22,7 @@ test_expect_success 'preparation' '
|
||||||
while read cmd args
|
while read cmd args
|
||||||
do
|
do
|
||||||
cat >expect <<-'EOF'
|
cat >expect <<-'EOF'
|
||||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||||
EOF
|
EOF
|
||||||
test_expect_success "$cmd: small change with long name gives more space to the name" '
|
test_expect_success "$cmd: small change with long name gives more space to the name" '
|
||||||
git $cmd $args >output &&
|
git $cmd $args >output &&
|
||||||
|
@ -31,7 +31,7 @@ do
|
||||||
'
|
'
|
||||||
|
|
||||||
cat >expect <<-'EOF'
|
cat >expect <<-'EOF'
|
||||||
...aaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||||
EOF
|
EOF
|
||||||
test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
|
test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
|
||||||
git $cmd $args --stat=40 >output &&
|
git $cmd $args --stat=40 >output &&
|
||||||
|
@ -46,7 +46,7 @@ do
|
||||||
'
|
'
|
||||||
|
|
||||||
cat >expect <<-'EOF'
|
cat >expect <<-'EOF'
|
||||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||||
EOF
|
EOF
|
||||||
test_expect_success "$cmd --stat=...,name-width with long name" '
|
test_expect_success "$cmd --stat=...,name-width with long name" '
|
||||||
git $cmd $args --stat=60,30 >output &&
|
git $cmd $args --stat=60,30 >output &&
|
||||||
|
|
|
@ -528,7 +528,7 @@ cat >expect <<\EOF
|
||||||
| |
|
| |
|
||||||
| | reach
|
| | reach
|
||||||
| | ---
|
| | ---
|
||||||
| | reach.t | 1 +
|
| | reach.t | 1 +
|
||||||
| | 1 file changed, 1 insertion(+)
|
| | 1 file changed, 1 insertion(+)
|
||||||
| |
|
| |
|
||||||
| | diff --git a/reach.t b/reach.t
|
| | diff --git a/reach.t b/reach.t
|
||||||
|
@ -551,7 +551,7 @@ cat >expect <<\EOF
|
||||||
| | |
|
| | |
|
||||||
| | | octopus-b
|
| | | octopus-b
|
||||||
| | | ---
|
| | | ---
|
||||||
| | | octopus-b.t | 1 +
|
| | | octopus-b.t | 1 +
|
||||||
| | | 1 file changed, 1 insertion(+)
|
| | | 1 file changed, 1 insertion(+)
|
||||||
| | |
|
| | |
|
||||||
| | | diff --git a/octopus-b.t b/octopus-b.t
|
| | | diff --git a/octopus-b.t b/octopus-b.t
|
||||||
|
@ -567,7 +567,7 @@ cat >expect <<\EOF
|
||||||
| |
|
| |
|
||||||
| | octopus-a
|
| | octopus-a
|
||||||
| | ---
|
| | ---
|
||||||
| | octopus-a.t | 1 +
|
| | octopus-a.t | 1 +
|
||||||
| | 1 file changed, 1 insertion(+)
|
| | 1 file changed, 1 insertion(+)
|
||||||
| |
|
| |
|
||||||
| | diff --git a/octopus-a.t b/octopus-a.t
|
| | diff --git a/octopus-a.t b/octopus-a.t
|
||||||
|
@ -583,7 +583,7 @@ cat >expect <<\EOF
|
||||||
|
|
|
|
||||||
| seventh
|
| seventh
|
||||||
| ---
|
| ---
|
||||||
| seventh.t | 1 +
|
| seventh.t | 1 +
|
||||||
| 1 file changed, 1 insertion(+)
|
| 1 file changed, 1 insertion(+)
|
||||||
|
|
|
|
||||||
| diff --git a/seventh.t b/seventh.t
|
| diff --git a/seventh.t b/seventh.t
|
||||||
|
@ -617,7 +617,7 @@ cat >expect <<\EOF
|
||||||
| | | |
|
| | | |
|
||||||
| | | | tangle-a
|
| | | | tangle-a
|
||||||
| | | | ---
|
| | | | ---
|
||||||
| | | | tangle-a | 1 +
|
| | | | tangle-a | 1 +
|
||||||
| | | | 1 file changed, 1 insertion(+)
|
| | | | 1 file changed, 1 insertion(+)
|
||||||
| | | |
|
| | | |
|
||||||
| | | | diff --git a/tangle-a b/tangle-a
|
| | | | diff --git a/tangle-a b/tangle-a
|
||||||
|
@ -639,7 +639,7 @@ cat >expect <<\EOF
|
||||||
| |/| |
|
| |/| |
|
||||||
| | | | side-2
|
| | | | side-2
|
||||||
| | | | ---
|
| | | | ---
|
||||||
| | | | 2 | 1 +
|
| | | | 2 | 1 +
|
||||||
| | | | 1 file changed, 1 insertion(+)
|
| | | | 1 file changed, 1 insertion(+)
|
||||||
| | | |
|
| | | |
|
||||||
| | | | diff --git a/2 b/2
|
| | | | diff --git a/2 b/2
|
||||||
|
@ -655,7 +655,7 @@ cat >expect <<\EOF
|
||||||
| | | |
|
| | | |
|
||||||
| | | | side-1
|
| | | | side-1
|
||||||
| | | | ---
|
| | | | ---
|
||||||
| | | | 1 | 1 +
|
| | | | 1 | 1 +
|
||||||
| | | | 1 file changed, 1 insertion(+)
|
| | | | 1 file changed, 1 insertion(+)
|
||||||
| | | |
|
| | | |
|
||||||
| | | | diff --git a/1 b/1
|
| | | | diff --git a/1 b/1
|
||||||
|
@ -671,7 +671,7 @@ cat >expect <<\EOF
|
||||||
| | | |
|
| | | |
|
||||||
| | | | Second
|
| | | | Second
|
||||||
| | | | ---
|
| | | | ---
|
||||||
| | | | one | 1 +
|
| | | | one | 1 +
|
||||||
| | | | 1 file changed, 1 insertion(+)
|
| | | | 1 file changed, 1 insertion(+)
|
||||||
| | | |
|
| | | |
|
||||||
| | | | diff --git a/one b/one
|
| | | | diff --git a/one b/one
|
||||||
|
@ -687,7 +687,7 @@ cat >expect <<\EOF
|
||||||
|/| |
|
|/| |
|
||||||
| | | sixth
|
| | | sixth
|
||||||
| | | ---
|
| | | ---
|
||||||
| | | a/two | 1 -
|
| | | a/two | 1 -
|
||||||
| | | 1 file changed, 1 deletion(-)
|
| | | 1 file changed, 1 deletion(-)
|
||||||
| | |
|
| | |
|
||||||
| | | diff --git a/a/two b/a/two
|
| | | diff --git a/a/two b/a/two
|
||||||
|
@ -703,7 +703,7 @@ cat >expect <<\EOF
|
||||||
| | |
|
| | |
|
||||||
| | | fifth
|
| | | fifth
|
||||||
| | | ---
|
| | | ---
|
||||||
| | | a/two | 1 +
|
| | | a/two | 1 +
|
||||||
| | | 1 file changed, 1 insertion(+)
|
| | | 1 file changed, 1 insertion(+)
|
||||||
| | |
|
| | |
|
||||||
| | | diff --git a/a/two b/a/two
|
| | | diff --git a/a/two b/a/two
|
||||||
|
@ -719,7 +719,7 @@ cat >expect <<\EOF
|
||||||
| |
|
| |
|
||||||
| | fourth
|
| | fourth
|
||||||
| | ---
|
| | ---
|
||||||
| | ein | 1 +
|
| | ein | 1 +
|
||||||
| | 1 file changed, 1 insertion(+)
|
| | 1 file changed, 1 insertion(+)
|
||||||
| |
|
| |
|
||||||
| | diff --git a/ein b/ein
|
| | diff --git a/ein b/ein
|
||||||
|
@ -735,8 +735,8 @@ cat >expect <<\EOF
|
||||||
|
|
|
|
||||||
| third
|
| third
|
||||||
| ---
|
| ---
|
||||||
| ichi | 1 +
|
| ichi | 1 +
|
||||||
| one | 1 -
|
| one | 1 -
|
||||||
| 2 files changed, 1 insertion(+), 1 deletion(-)
|
| 2 files changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
|
|
||||||
| diff --git a/ichi b/ichi
|
| diff --git a/ichi b/ichi
|
||||||
|
@ -759,7 +759,7 @@ cat >expect <<\EOF
|
||||||
|
|
|
|
||||||
| second
|
| second
|
||||||
| ---
|
| ---
|
||||||
| one | 2 +-
|
| one | 2 +-
|
||||||
| 1 file changed, 1 insertion(+), 1 deletion(-)
|
| 1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
|
|
||||||
| diff --git a/one b/one
|
| diff --git a/one b/one
|
||||||
|
@ -775,7 +775,7 @@ cat >expect <<\EOF
|
||||||
|
|
||||||
initial
|
initial
|
||||||
---
|
---
|
||||||
one | 1 +
|
one | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/one b/one
|
diff --git a/one b/one
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
Documentation/git-cvsimport-script.txt | 9 ++++++++-
|
Documentation/git-cvsimport-script.txt | 9 ++++++++-
|
||||||
git-cvsimport-script | 4 ++--
|
git-cvsimport-script | 4 ++--
|
||||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
50452f9c0c2df1f04d83a26266ba704b13861632
|
50452f9c0c2df1f04d83a26266ba704b13861632
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 2 +-
|
builtin-mailinfo.c | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 4 ++--
|
builtin-mailinfo.c | 4 ++--
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
index 3e5fe51..aabfe5c 100644
|
index 3e5fe51..aabfe5c 100644
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
||||||
1 files changed, 36 insertions(+), 1 deletions(-)
|
1 files changed, 36 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
||||||
1 files changed, 36 insertions(+), 1 deletions(-)
|
1 files changed, 36 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
|
|
|
@ -12,7 +12,7 @@ Subject: [PATCH] a commit.
|
||||||
Here is a patch from A U Thor.
|
Here is a patch from A U Thor.
|
||||||
|
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
@ -52,7 +52,7 @@ two truly blank and another full of spaces in between.
|
||||||
Hope this helps.
|
Hope this helps.
|
||||||
|
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
@ -83,7 +83,7 @@ Message-Id: <nitpicker.12121212@example.net>
|
||||||
Hopefully this would fix the problem stated there.
|
Hopefully this would fix the problem stated there.
|
||||||
|
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
@ -249,8 +249,8 @@ actual flags.
|
||||||
Signed-off-by: David K=E5gedal <davidk@lysator.liu.se>
|
Signed-off-by: David K=E5gedal <davidk@lysator.liu.se>
|
||||||
---
|
---
|
||||||
|
|
||||||
Documentation/git-cvsimport-script.txt | 9 ++++++++-
|
Documentation/git-cvsimport-script.txt | 9 ++++++++-
|
||||||
git-cvsimport-script | 4 ++--
|
git-cvsimport-script | 4 ++--
|
||||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
50452f9c0c2df1f04d83a26266ba704b13861632
|
50452f9c0c2df1f04d83a26266ba704b13861632
|
||||||
|
@ -379,7 +379,7 @@ Subject: [PATCH] a commit.
|
||||||
Here is a patch from A U Thor.
|
Here is a patch from A U Thor.
|
||||||
|
|
||||||
---
|
---
|
||||||
foo | 2 +-
|
foo | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/foo b/foo
|
diff --git a/foo b/foo
|
||||||
|
@ -449,7 +449,7 @@ memcmp("Subject: ", header[i], 7) will never match.
|
||||||
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
|
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
|
||||||
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 2 +-
|
builtin-mailinfo.c | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
|
@ -482,7 +482,7 @@ Content-Transfer-Encoding: quoted-printable
|
||||||
Here comes a commit log message, and
|
Here comes a commit log message, and
|
||||||
its second line is here.
|
its second line is here.
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 4 ++--
|
builtin-mailinfo.c | 4 ++--
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
index 3e5fe51..aabfe5c 100644
|
index 3e5fe51..aabfe5c 100644
|
||||||
|
@ -587,7 +587,7 @@ everything before it in the message body.
|
||||||
|
|
||||||
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
||||||
---
|
---
|
||||||
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
||||||
1 files changed, 36 insertions(+), 1 deletions(-)
|
1 files changed, 36 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
||||||
|
|
|
@ -54,9 +54,9 @@ Trying simple merge with c2
|
||||||
Trying simple merge with c3
|
Trying simple merge with c3
|
||||||
Trying simple merge with c4
|
Trying simple merge with c4
|
||||||
Merge made by the 'octopus' strategy.
|
Merge made by the 'octopus' strategy.
|
||||||
c2.c | 1 +
|
c2.c | 1 +
|
||||||
c3.c | 1 +
|
c3.c | 1 +
|
||||||
c4.c | 1 +
|
c4.c | 1 +
|
||||||
3 files changed, 3 insertions(+)
|
3 files changed, 3 insertions(+)
|
||||||
create mode 100644 c2.c
|
create mode 100644 c2.c
|
||||||
create mode 100644 c3.c
|
create mode 100644 c3.c
|
||||||
|
@ -71,7 +71,7 @@ test_expect_success 'merge output uses pretty names' '
|
||||||
|
|
||||||
cat >expected <<\EOF
|
cat >expected <<\EOF
|
||||||
Merge made by the 'recursive' strategy.
|
Merge made by the 'recursive' strategy.
|
||||||
c5.c | 1 +
|
c5.c | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
create mode 100644 c5.c
|
create mode 100644 c5.c
|
||||||
EOF
|
EOF
|
||||||
|
@ -85,8 +85,8 @@ cat >expected <<\EOF
|
||||||
Fast-forwarding to: c1
|
Fast-forwarding to: c1
|
||||||
Trying simple merge with c2
|
Trying simple merge with c2
|
||||||
Merge made by the 'octopus' strategy.
|
Merge made by the 'octopus' strategy.
|
||||||
c1.c | 1 +
|
c1.c | 1 +
|
||||||
c2.c | 1 +
|
c2.c | 1 +
|
||||||
2 files changed, 2 insertions(+)
|
2 files changed, 2 insertions(+)
|
||||||
create mode 100644 c1.c
|
create mode 100644 c1.c
|
||||||
create mode 100644 c2.c
|
create mode 100644 c2.c
|
||||||
|
|
Loading…
Reference in a new issue