repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: migrate to parse-options API
2010-08-06
Jo
n
a
t
han Nieder
rere
r
e: migrate to par
s
e
-options
API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
N
ieder
t4200 (re
r
ere): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ll-merge
:
let caller decide whether to
r
enormalize
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
ll-mer
g
e: make flag easier
t
o
p
o
pul
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
Document
a
tion/techni
c
al
:
document ll_mer
g
e
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
merge
-
trees: let caller
d
ec
i
de whether to
r
e
normalize
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
merge
-
trees: push choice
to
renormali
z
e away from low
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
Nieder
t6038 (merge
.
renormalize): check th
a
t it can be turned of
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
der
t6038
(merge
.
renormalize): try chec
k
out -m
a
nd cherry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
t6038 (merge
.
r
e
norma
l
i
ze):
style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
E
y
vi
n
d Bernhardsen
Don't expand CRLFs when normalizing text during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvi
n
d
B
ernhardsen
Try n
o
rmalizing files to
a
v
oi
d
delete/modify conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Be
r
nhardsen
Avo
i
d con
f
lict
s
when m
e
r
ging
branches with mixe
d
normalization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
G
it 1
.
7
.
2-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o C Haman
o
Merge branch 'c
p
/textc
o
nv-cat-file'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C
H
amano
Merge branch
'pb/main
t
-p
e
rl-err
m
sg
-
n
o-dir'
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o C Hamano
Merge branch 'tr/se
n
d-email-8bit'
commit
|
commitdiff
|
tree
2010-06-27
Juni
o
C Haman
o
Merge branch 'js
/
maint-am
-
rebase-
i
nva
l
i
d
-
auth
o
r'
commit
|
commitdiff
|
tree
2010-06-27
J
unio C Hamano
Merg
e
branch 'ab
/
b
lame-textconv'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge branch 'jn/
s
ho
w
-n
u
m-walk
s
'
commit
|
commitdiff
|
tree
2010-06-25
Junio C
H
am
a
no
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-06-25
Rams
a
y Jones
msvc: Fix
some
c
om
p
iler wa
r
nings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-25
Chri
s
tian Couder
Docu
m
enta
t
ion: grep: fix asciidoc problem with --
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Michae
l
J Gruber
git-cat-file
.
txt:
D
ocument --
t
extconv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Ramsay
Jon
e
s
m
s
vc: Fix some "e
x
pr e
v
aluate
s
to function"
c
ompiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-23
Jun
i
o
C
Haman
o
Merge branch 'j
k
/ur
l
-
d
ecode'
commit
|
commitdiff
|
tree
2010-06-23
Junio
C
Hamano
ur
l
.
c:
"
<scheme>://" part at the begin
n
ing should
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Ham
a
no
Up
d
ate draft rel
e
ase notes t
o
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o
C Hamano
Mer
g
e
b
ranch 'jc/main
t
-simpler-
c
ommon-pref
i
x'
commit
|
commitdiff
|
tree
2010-06-22
J
unio
C
H
a
mano
M
e
r
g
e branch
'
s
b/format
-
p
a
tch-signature'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
b
ranch '
m
g/pretty-
m
a
gic-space'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'jn/gitweb-ret
u
rn
-
or-exit-cleanup'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hamano
M
erge branch 'bd/mai
n
t-u
n
p
a
ck-trees-
p
arawa
l
k-fix'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C
H
am
a
no
Merge branch 'cc
/
c
h
erry-pi
c
k-series'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
a
n
o
Merge branch
'
jc/rev-list-ances
t
ry-pa
t
h
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
branch 'lt
/
extended-sha
1
-match-commit-with-r
e
g
e
xp'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
H
a
ma
n
o
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Upda
t
e draft release no
t
es to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Merge branch 'ic/main
t
-rebase-i-abort' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
M
erge b
r
anch 'cc/maint
-
commit-
r
eflog-msg' into maint
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
Merge
b
r
anch 'j
k
/maint-advic
e
-empty-am
e
nd' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Merge b
r
anch 'tc/commit-
a
bbrev
-
fix' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merg
e
branch 'jn/document-rebase-
i
-
p
-limitation'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'jn/ch
e
ckout
-
doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ham
a
no
M
e
r
ge
b
ranch
'c
c
/maint-diff-C
C
-binary'
in
t
o maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge bran
c
h 'jc/t9129-any
-
utf8' int
o
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Ham
a
no
Merge branch 'cb/ls-files-cdup'
into m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
i
o
C
H
a
mano
Merge branch 'tc/
m
erge-m-
l
og'
i
n
to
main
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch
'ph/c
l
one-message-reword' into
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch
'jn/mai
n
t
-
a
mend-missing-
n
ame'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge br
a
nch '
p
c/re
m
ove-warn' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
am
a
no
tests: rem
o
ve unnecessary '^'
from
'
expr' re
g
ular
e
xpr
e
ss
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C
Hamano
M
er
g
e branch 'js/
m
a
i
nt-receive-
p
ack-symref-a
l
ias'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hama
n
o
M
e
rge
b
ran
c
h 'cc/mai
n
t-commi
t
-
r
e
flog-msg'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Haman
o
Merge branch 'ic/maint-reba
s
e-i-a
b
ort'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C
H
am
a
no
M
erge branch 'jk/maint-advice-empty-amend'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch
'
eb/core-eol'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
m
ano
Merge branch 'fg/au
t
ocrlf'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge branch '
s
m/bra
n
c
h-br
o
ken-ref'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C
Hamano
M
e
rg
e
bra
n
ch 'rr/
p
arse
-
date
-
refactor'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merg
e
branch 'jn/
d
ocument-re
b
ase-i-p-l
i
mitatio
n
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Merge branch 'tc/commit-abbrev-fix
'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Ha
m
an
o
Me
r
ge branch 'tr/receive-pack-aliase
d
-update-f
i
x
'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C H
a
mano
Merge br
a
nc
h
'gs/usa
g
e-t
o
-
s
tdout'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
erg
e
b
r
anch '
j
s/async-thread'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
am
a
no
M
e
rge branch 'g
v
/portable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
M
e
rg
e
branch
'
bc/por
t
able'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
er
g
e branc
h
'jn/gitweb-fas
t
c
g
i'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C
H
amano
M
erge
b
ranch
'jn
/
checkout-doc'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
M
erge
b
ranch 'em
/
c
heck
o
ut-
o
r
p
han'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
Drop items th
a
t are 1
.
7
.
1
.
1 fixes from the 1
.
7
.
1 release
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
J
un
i
o C Hamano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C Hamano
Update draft release no
t
es to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
M
e
rg
e
branch 'mc/maint-zoneparse' i
n
to maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
Merge b
r
anch 'jk/
d
iff
-
m-doc' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Merge
b
ranch
'jn/
m
aint
-
doc-
i
gnore' into m
a
int
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
Me
r
ge branch
'
b
s
/
u
s
erdif
f
-php' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hama
n
o
M
erge bran
c
h
'
jk/
m
aint-sh
a
1
-fil
e
-name-
f
ix'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'j
k
/maint
-
p
u
ll
-
dry-run-noop'
i
nto
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'bw/
d
iff-metainfo-color'
i
n
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Ham
a
no
Merge branch 'cb/assu
m
e-unchanged-fix' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
Merge branch
'
jn
/
notes-doc
'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
J
unio C
H
am
a
no
Merge branch
'
ab/test-cleanup
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'rs/diff-no-minim
a
l' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
ma
n
o
Merge
branch 'bg/apply-bla
n
k-traili
n
g-cont
e
x
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
amano
Merg
e
bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2010-06-21
Ævar
A
rnf
j
örð Bjarmas
o
n
git-cv
s
server: fix
error
fo
r
i
n
valid password form
a
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bja
r
mason
git-c
v
sserver: typo in
a
comment: bas -
>
has
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-20
Jay Soffian
gitweb/Ma
k
efi
l
e: fix typo in gitweb
.
m
i
n
.
css rule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
C
l
éme
n
t Poulain
t/t8007: test textconv support for
c
a
t
-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Clém
e
nt Poulain
textconv: support for cat_file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio
C Hama
n
o
Update draft release notes to
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hama
n
o
Merge branch 'cc/maint-diff-CC-b
i
na
r
y
'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
i
o C Hama
n
o
Me
r
ge b
r
anch
'
b
y/diff-graph'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'cb/ls
-
files-cd
u
p'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
io C
Hamano
Merge b
r
a
nc
h
'jc/t91
2
9-any-utf8'
commit
|
commitdiff
|
tree
2010-06-18
Juni
o
C Hamano
Merge
b
r
anch 'rr/am-help'
commit
|
commitdiff
|
tree
2010-06-18
J
un
i
o C Hamano
Merge branch 'j
n
/
r
ebase
-
cmdline-fix'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Me
r
g
e branch 'ps/gitweb--b
r
owse
-
ch
r
om
e
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
e
rge branch 'jk/am
-
skip-hint'
commit
|
commitdiff
|
tree
next