repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
ll-merge: replace flag argument with options struct
2010-08-26
Jonatha
n
N
i
e
d
er
ll-
m
erge:
replace flag arg
u
ment with options st
r
uct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Jonathan
N
i
eder
me
r
ge-rec
u
rsive: expose merge o
p
ti
o
ns for builti
n
merge
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan
Ni
e
der
mer
g
e-recur
s
ive --
r
enormalize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
rerere: never renormalize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
rerere: migrate to p
a
rse-o
p
tions API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
t4200 (rere
r
e):
modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
a
than Nieder
ll-
m
erg
e
: let caller decide w
h
ether to reno
r
malize
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ll
-
me
r
ge:
m
ake flag eas
i
er to popu
l
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
on
a
than Nieder
Documentation/
t
e
c
hnical
:
docu
m
ent ll_merge
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
mer
g
e-trees:
l
et caller decide whether t
o
renorma
l
ize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han
N
ieder
merge
-
tree
s
: pus
h
choic
e
to renormalize a
w
ay from l
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
ha
n
Nieder
t60
3
8 (m
e
rge
.
reno
r
malize): check t
h
at it can be turned o
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
na
t
han
N
ieder
t60
3
8 (
m
e
r
g
e
.
renormalize): t
r
y che
c
kout -m and cherr
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
der
t6038 (merg
e
.
renorma
l
i
z
e)
:
s
t
yl
e
nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
E
y
vi
n
d Be
r
nhardsen
Don't
e
x
pand CR
L
Fs when normalizing text durin
g
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind
B
ernhardsen
Try normalizing file
s
to a
v
o
id delete/modify conf
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
E
y
vind B
e
rnhardsen
Avoid
conflicts when mergi
n
g
b
ranch
e
s with mixed norma
l
ization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
J
u
nio C Ham
a
no
Git 1
.
7
.
2
-
rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge
bra
n
ch 'c
p
/textconv-cat-fi
l
e'
commit
|
commitdiff
|
tree
2010-06-27
Ju
n
io
C Hamano
Merge br
a
n
ch 'pb/maint-perl-e
r
rmsg-no-di
r
'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Ha
m
ano
Merg
e
b
r
a
n
c
h 'tr/s
e
n
d-ema
i
l-8bit'
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o
C Ham
a
no
Merge branch 'j
s
/maint-a
m
-
rebase
-
invalid-a
u
thor'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C Hamano
Merge branch 'ab/b
l
ame-tex
t
conv'
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o C Hamano
Merge branch
'
jn/show-num-walks'
commit
|
commitdiff
|
tree
2010-06-25
Junio
C
Hama
n
o
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-06-25
Ramsay Jones
msvc
:
Fix s
o
me compile
r
w
a
rnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-25
C
h
ristian
C
ouder
D
ocumentation: grep: fix as
c
iidoc problem
w
i
th
-
-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
M
i
chael J
Gruber
git-
c
at-file
.
t
xt: Doc
u
ment --
t
extc
o
nv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Ramsay J
o
nes
msvc: Fix som
e
"expr
e
valuates to function"
c
o
mpile
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-23
J
u
nio C Ham
a
no
Merge branch 'j
k
/url-decode
'
commit
|
commitdiff
|
tree
2010-06-23
Juni
o
C Ha
m
ano
url
.
c
: "<scheme>://"
part at the beginning
should not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Ham
a
no
Update draft re
l
ease no
t
es to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
Me
r
g
e branch
'
jc/ma
i
nt-si
m
pler-common
-
prefix'
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
Merge branch
'
s
b/format-patch-signat
u
r
e'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
H
amano
Merge bra
n
ch
'
mg/pret
t
y
-
magic-sp
a
ce'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Mer
g
e
branch 'jn/
g
itweb-
r
etur
n
-or-
e
x
i
t
-
c
l
eanup'
commit
|
commitdiff
|
tree
2010-06-22
J
unio C Ha
m
ano
Mer
g
e
b
r
a
n
c
h 'bd
/
maint-unpa
c
k-tr
e
e
s
-
p
arawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C H
a
mano
Merge bra
n
ch
'cc
/
cher
r
y-pick-se
r
ies'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'jc/rev
-
l
i
st-an
c
estry-
p
a
t
h
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'lt/ext
e
nded-sha1-match-commit-
w
it
h
-regexp'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hamano
Merge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hama
n
o
Update dra
f
t
r
ele
a
se notes to 1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'i
c
/ma
i
n
t-re
b
ase-i-
a
bort' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Me
r
ge
b
r
a
nch '
c
c/m
a
i
n
t-commit-reflog-msg' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
Merge branch 'j
k
/m
a
in
t
-advi
c
e-empt
y
-amend'
into
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hamano
M
e
rge branch 'tc/com
m
it-abbrev-fix'
into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hamano
Merge branc
h
'
jn/doc
u
m
e
n
t-
r
ebase-i-p-limitation' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Ham
a
no
Merge
bran
c
h 'jn
/
c
heckout-d
o
c' into
maint
commit
|
commitdiff
|
tree
2010-06-22
J
u
n
i
o C
H
a
m
a
no
M
e
r
g
e branch 'cc/maint-diff-CC-binary' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Me
r
ge branch 'jc/t9129-any-
u
tf8' into maint
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Haman
o
M
erge b
r
a
n
ch 'cb/ls-files-cdup' int
o
main
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
an
o
Merge bran
c
h 'tc/merge-m-log'
i
nto
maint
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Merge branch 'ph
/
clone-messa
g
e-reword' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
e
rg
e
branch 'jn/maint-amend-missin
g
-n
a
me' into maint
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hama
n
o
Merge branch 'pc/remove-wa
r
n
'
into
m
aint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
tests:
remove unnecessary '^
'
f
r
om 'expr' reg
u
lar exp
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
mano
Merge
b
ranch 'j
s
/maint-
r
eceiv
e
-pack-symref
-
alias'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hama
n
o
Merge branch
'cc/m
a
int-co
m
mi
t
-reflo
g
-msg'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
Merge branch 'ic/m
a
int-rebase-i
-
ab
o
rt'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Ham
a
no
Merge b
r
a
n
ch '
j
k
/
m
a
int-advice
-
empty-amen
d
'
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o C Ha
m
ano
Merge branch 'eb/core
-
eol
'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
i
o C H
a
ma
n
o
Merge branc
h
'fg/
a
utoc
r
lf'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hama
n
o
M
e
rge bra
n
c
h
'sm/branch-
b
roken-ref'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Merge branch 'rr/parse-date-refacto
r
'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Mer
g
e
branch 'jn/
d
ocum
e
nt-rebase-i-
p
-limit
a
tion'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Me
r
ge
b
ra
n
ch 'tc/commit-abbrev-fix
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
M
erge branch 'tr/rec
e
ive
-
p
a
ck-al
i
a
s
e
d-update-fix'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C Hama
n
o
Merge
br
a
nc
h
'gs/usage-to-stdout'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
aman
o
Merge branch 'js/async-th
r
ead'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'gv/portable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge b
r
a
n
ch 'bc/p
o
rtable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge b
r
anch 'jn/gi
t
web-fa
s
t
c
gi'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge branch
'jn/checkout-
d
oc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
b
ranch '
e
m/checkout-orpha
n
'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Drop i
t
e
ms t
h
at are 1
.
7
.
1
.
1
fix
e
s from
t
he 1
.
7
.
1 release
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Haman
o
M
erge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Update
d
raft re
l
e
ase notes to 1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o C
H
a
m
a
n
o
Merg
e
br
a
nch 'mc/mai
n
t-zonepars
e
' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
r
ge branch 'jk/diff-m-doc' i
n
to maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'jn/maint-
d
oc-
i
gnore' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'bs/userd
i
f
f
-php' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge branch
'
jk/maint
-
sha1-file-name-
f
ix' into
m
aint
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Merge branch 'jk/maint-pul
l
-dry-run-
n
oop' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge br
a
nch '
b
w/diff-m
e
tainf
o
-co
l
or' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Merge b
r
anch 'cb/assume-unchanged-fix' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge
b
ranch 'jn/not
e
s-doc' into maint
commit
|
commitdiff
|
tree
2010-06-21
J
unio
C Ham
a
no
M
e
r
ge branch
'
ab/t
e
st-c
l
ea
n
up' in
t
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'rs/dif
f
-
no-minimal' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
erge b
r
a
nch 'bg/apply-blank-trailing-context' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-06-21
Æv
a
r Arnfjö
r
ð
Bj
a
rmason
git-cvsserver: fix error for invalid pass
w
o
r
d forma
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð
B
jarmason
g
it-cv
s
serve
r
: typo in a comment:
bas ->
h
a
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-20
Jay Soffian
gitweb
/
Makefile: fix ty
p
o in gi
t
web
.
min
.
cs
s
rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Cl
é
ment
Poulain
t/t8
0
0
7:
t
e
st textconv support f
o
r cat-fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clément Po
u
lain
text
c
onv: support for cat_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Jun
i
o C
Hamano
U
p
d
a
te draf
t
release notes
to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
H
a
m
a
no
Merg
e
branch
'
cc
/
maint-dif
f
-CC-bi
n
ary'
commit
|
commitdiff
|
tree
2010-06-18
Juni
o
C
Haman
o
Merge branc
h
'by/diff-graph'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
erge branch 'cb/ls-files-cdup'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge bra
n
ch 'jc/t9129-any-utf8'
commit
|
commitdiff
|
tree
next