repo.or.cz
/
git
/
jnareb-git.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
Jonathan Nieder
rerere: mi
g
rate to parse-options API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
t4
2
00 (rerere):
m
o
dernize
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nied
e
r
ll
-
merge: l
e
t c
a
ller decide whether to renormalize
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
th
a
n
Ni
e
der
l
l-mer
g
e
:
mak
e
fl
a
g
e
asier to populate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
t
h
an Nieder
D
ocum
e
nt
a
tion/technica
l
: document ll_merge
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
na
t
han
Niede
r
merge
-
t
rees: let caller
d
eci
d
e whet
h
er to
r
enor
m
alize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
a
n
Nieder
merge-
t
rees: push choice to renormalize away
fr
o
m lo
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
t6038
(merge
.
renormalize): check th
a
t
it
c
an be t
u
rned
o
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
ath
a
n Nied
e
r
t6038 (
m
e
rge
.
reno
r
malize): t
r
y checkout
-
m
and cherr
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nieder
t
6038 (merge
.
renorm
a
l
i
ze):
s
t
yle nit
p
i
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernhardsen
Don't
expan
d
C
R
L
Fs when normalizing text
d
uring merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
E
yvind
B
ernh
a
r
d
s
e
n
Try normaliz
i
n
g files to avoid delete/m
o
dify
c
onfli
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernh
a
rd
s
en
Avoid conflicts
w
hen merg
i
ng branches with mi
x
ed normal
i
zat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
G
it
1
.
7
.
2-rc
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
J
u
n
i
o
C Hamano
Me
r
g
e bran
c
h 'cp
/
text
c
on
v
-cat-
f
ile
'
commit
|
commitdiff
|
tree
2010-06-27
J
u
n
i
o
C
Ham
a
n
o
M
e
rge
b
r
anch
'
pb/maint-perl-errmsg-no-dir
'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Mer
g
e branch 'tr/s
e
nd-email-8bit
'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C
H
amano
Mer
g
e branch 'js/maint-am-
r
eb
a
se-inva
l
id-au
t
hor'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C Hamano
Merge branch 'a
b
/blame-textconv'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C Hamano
Merg
e
branch
'
jn/sho
w
-n
u
m-
w
alks'
commit
|
commitdiff
|
tree
2010-06-25
Ju
n
io C Hamano
M
e
r
ge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2010-06-25
Ram
s
ay Jones
m
s
vc: Fi
x
so
m
e
c
o
mp
i
le
r
war
n
i
n
gs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-25
Ch
r
i
stian Cou
d
er
Do
c
u
mentat
i
on
:
grep
:
fix a
s
ciidoc prob
l
em
with
-
-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Michael J Gruber
git-cat-file
.
txt: Document --textcon
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Ramsay
Jones
ms
v
c: Fix s
o
me "expr
e
valua
t
es t
o
funct
i
o
n
" compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-23
Junio C Hamano
Merge br
a
nch 'j
k
/url-decode'
commit
|
commitdiff
|
tree
2010-06-23
J
u
n
io C H
a
ma
n
o
url
.
c:
"
<
s
c
heme>://" part a
t
the begi
n
ning should not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Update draft rele
a
se notes
to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
e
rge branch
'
jc/
m
ain
t
-
s
impl
e
r-common-prefix'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'sb
/
fo
r
ma
t
-
p
atch-s
i
gna
t
ure'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Mer
g
e branch 'mg/
p
retty
-
ma
g
ic-s
p
ace'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io
C H
a
man
o
Merge branch 'jn/gitweb-retur
n
-
or-exit-cleanup'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Merge branc
h
'bd/maint-u
n
pack-
t
ree
s
-
para
w
alk-fi
x
'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C H
a
mano
M
e
r
ge
branch 'cc/cherry
-
pick-seri
e
s'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
erge branch 'jc/r
e
v
-
list-ancest
r
y
-
path'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
e
rge
bran
c
h 'l
t
/extended-sha1-match-
c
o
m
mi
t
-
w
ith-r
e
g
e
xp'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
Update d
r
aft relea
s
e note
s
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 'ic/maint-reba
s
e-i-abort'
into
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'cc/
m
aint
-
c
o
mmit-reflog-ms
g
' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Merge
b
ranch 'jk/maint-
a
dvice-e
m
pty-a
m
end' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Hamano
Merge branch
'tc
/
commit-abbrev-fi
x
' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hama
n
o
Merge branc
h
'jn/docume
n
t-rebase-i-p-limita
t
ion'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
a
m
ano
Mer
g
e
branc
h
'jn/checkout-doc' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch
'cc
/
mai
n
t
-diff
-
CC-b
i
nary' into maint
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C H
a
mano
Merg
e
br
a
n
ch 'jc/t9129-any-ut
f
8' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Ham
a
no
Merge branch 'cb/ls-fil
e
s-cdup' into
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C
H
a
m
a
no
M
e
r
g
e
branch 'tc/me
r
ge-
m
-lo
g
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Merge bra
n
ch '
p
h/clone-me
s
sage-reword' into m
a
in
t
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Ham
a
no
Mer
g
e branch 'jn/m
a
int-amend-missing-na
m
e'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
M
e
rge b
r
anch 'pc/remove-warn' i
n
to maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
tests: remove unnecessary '^'
f
rom 'expr'
reg
u
lar exp
r
es
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C H
a
mano
M
erge bran
c
h
'
j
s/maint-receive-p
a
c
k
-
symref-alias'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge branch 'cc/
m
aint-c
o
mmit-reflog-msg'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Haman
o
Me
r
ge
b
r
a
nch
'
ic/ma
i
nt-rebas
e
-
i
-abort'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Ha
m
an
o
Merge b
r
anch '
j
k/maint
-
advice
-
empty
-
ame
n
d'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io
C
Hamano
Merge branch 'e
b
/co
r
e
-eol'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge bra
n
ch 'f
g
/auto
c
rlf'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Merge branch 'sm
/
branch-broken-ref'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'r
r
/pars
e
-dat
e
-re
f
actor'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge
branch 'j
n
/docu
m
ent-rebase-i-p-l
i
mitation'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Haman
o
Merge branch 'tc/commi
t
-abbrev-fix'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge branch 'tr/receive-pack-alias
e
d-update-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
erge branch 'gs
/
usage-to-stdo
u
t'
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C
H
a
mano
Merge branch 'js/async-thread'
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Merge branch 'gv/por
t
able'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge bran
c
h
'
b
c/portable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
Merge bra
n
ch
'
jn/gitweb-fastc
g
i'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io
C H
a
m
a
no
Merge branch
'jn/
c
heckout-doc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
b
ran
c
h 'em/ch
e
ckout-or
p
ha
n
'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C Ham
a
no
Drop items that
a
re 1
.
7
.
1
.
1 fix
e
s fr
o
m
the
1
.
7
.
1 rel
e
ase
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
am
a
no
Update
d
r
aft r
e
lease notes t
o
1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge
branch 'm
c
/
maint-zoneparse'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hama
n
o
Merge
bran
c
h 'jk/
d
i
f
f
-m-doc' in
t
o maint
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Haman
o
Merge branch 'jn/maint-doc-ignore'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge
b
r
anch '
b
s/u
s
erdiff-p
h
p' into maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C
H
amano
Merge
b
r
anc
h
'
jk/m
a
int-sha1-file-name-f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
m
ano
Merge bran
c
h 'jk/mai
n
t-pu
l
l
-dry-ru
n
-noop'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C Haman
o
Merge branch 'bw
/
diff-metainfo-
c
o
lor
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C Ham
a
n
o
Merge
b
ranch 'cb/assume-
u
n
change
d
-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
J
un
i
o
C Hama
n
o
Merge
b
ranch
'jn
/
notes-
d
oc' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch
'ab/test-
c
lean
u
p'
into
maint
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Haman
o
M
erg
e
bra
n
c
h
'r
s
/diff-no-minimal' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e br
a
nch 'bg/apply-blank-trailing-con
t
ext' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bjarmason
git-cvsserver: fix error fo
r
inv
a
l
i
d
password
formats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bjarmaso
n
g
it-cvss
e
rver
:
typo in a comment: bas -> has
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-20
Jay
S
offian
gi
t
w
e
b/Makefile:
f
i
x ty
p
o in gitweb
.
m
i
n
.
css rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clé
m
ent
Pou
l
ain
t
/
t8
0
07: test textconv
s
upport for
cat-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clémen
t
Poulain
textco
n
v: supp
o
rt f
o
r cat_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hama
n
o
Update draft r
e
lease
n
otes to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Haman
o
Merge br
a
nch
'cc/maint-diff-CC-binary'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Me
r
ge bra
n
c
h 'by/diff-graph
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Mer
g
e b
r
anch
'cb/ls-files-cdup'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge
b
ra
n
ch 'jc/t9129-
a
n
y
-utf8'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Me
r
ge
b
r
a
nch
'
rr/am-hel
p
'
commit
|
commitdiff
|
tree
2010-06-18
J
unio C Hamano
Merge
b
ranch
'
jn/rebase-cmdline
-
fix'
commit
|
commitdiff
|
tree
2010-06-18
J
unio
C Hama
n
o
Merge branch 'ps/gitw
e
b
-
-
browse-chrome'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Haman
o
Merg
e
branch 'jk/am-
s
k
i
p
-hint'
commit
|
commitdiff
|
tree
next