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
Git 1.7.0.1
2010-01-23
Junio C Hamano
Merg
e
branch 'j
s
/refer-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-23
J
u
n
io C
H
aman
o
Me
r
ge br
a
nch
'jl/submodule-dif
f
'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C
H
amano
Merge b
r
anch 'il/rem
o
te-updates'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
Hamano
M
e
r
g
e bra
n
ch 'il/branch
-
se
t
-
u
p
stream'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Hamano
Merge branch 'jc
/
ma
i
nt-
l
imit-
n
ote-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge br
a
nch 'n
d
/
ls-
f
i
les-sparse-
f
ix'
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C Ha
m
ano
i
gnor
e
dupl
i
cated slashes in
m
ake_relative_
p
ath()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
gi
t
-mv: fix moving
m
ore than one
s
o
urce to
a
sin
g
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
M
er
g
e
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-22
J
u
n
i
o C Ha
m
a
n
o
merg
e
-recursive: do
n
ot r
e
turn N
U
LL only to cause segfau
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Fix
"log --oneline"
n
ot
to s
h
o
w n
o
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C H
a
mano
conflict-mar
k
er-size: add test and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C H
a
mano
U
pdate dr
a
ft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C
Hamano
M
erge br
a
nch
'
bw/cvsi
m
port'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge bra
n
ch 'jc/checkou
t
-
m
erge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h
'
a
g
/pa
t
ch-header-v
e
rify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
ch 'jc/co
n
fl
i
ct-ma
r
ker
-
siz
e
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hama
n
o
Merg
e
bra
n
ch
'
ag/maint-
a
pply-too-la
r
ge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge bra
n
c
h '
a
p
/
merg
e
-bac
k
end-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Ham
a
no
Merge br
a
nc
h
'nd/sta
t
us-p
a
rtial-refre
s
h
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge remote b
r
anch
'
r
e
motes/tr
a
st-doc/
f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
Hamano
Merge branch 'jh
/
not
e
s
' (early par
t
)
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Mer
g
e bra
n
c
h
'jc/mai
n
t-r
e
fresh-
i
ndex-is
-
optional-f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
H
a
m
ano
Fix "log" family not to be too
a
gr
e
ssive a
b
out sh
o
wing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch '
r
r/core
-
tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge
branch
'jc/
c
ache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge branch 'js/exe
c
-
error
-
report'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'jc/ls
-
files-i
g
nored-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge br
a
nch 'jc/g
r
ep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
Merge bran
c
h
'jc/
m
a
int-strbuf-add
-
fix-doub
l
ing'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
g
e branc
h
'mm/conflic
t
-advic
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'da/di
f
ftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
erge branch 'm
h
/
r
ebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch
'
ns/rebas
e
-
a
uto-squash
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch 'mh/re
b
ase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
Merge branch 'il/push-set-upstrea
m
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branch 'jk/warn
-
author-commit
t
er-after-co
m
mit'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ham
a
no
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge br
a
nch 'tr/http-push-
r
ef-status
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge bran
c
h
'
bk/fix-
r
e
l
ativ
e
-g
i
tdir
-
fi
l
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
s
d/cd-p
-
s
how-topl
e
vel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
Mer
g
e
b
ranch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
d
ate
.
c: mark file-local f
u
n
ction
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Syn
c
with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge b
r
anch '
b
g
/
mai
n
t-remote-update-default'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
b
r
anch
'sb/maint-oct
o
p
u
s' into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Mer
g
e bran
c
h
'
bg/mai
n
t
-
a
d
d-all-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Mer
g
e branch 'jk/
m
aint-1
.
6
.
5-reset-hard' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge branch '
t
r/ma
i
nt-1
.
6
.
5
-
bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Ham
a
no
Merge b
r
anch
'
dp/m
a
int-
1
.
6
.
5-fast
-
import-n
o
n-c
o
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jm/maint-1
.
6
.
5-grep-NUL-terminat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Teach @{upstr
e
a
m
}
syntax to strbuf_branchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
t1506: more test fo
r
@{upstr
e
am}
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
F
i
x
"ch
e
ck
o
u
t
A
.
.
.
" synonym
fo
r
"ch
e
ckout
A
.
.
.
HEA
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't
r
e
quire the
re
p
ository to
be wr
i
table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ha
m
ano
Merge bran
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Mer
g
e bra
n
ch 'm
a
int-1
.
6
.
3'
i
nto maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ham
a
no
Merg
e
bran
c
h 'm
a
i
n
t-1
.
6
.
2'
i
n
to maint-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Me
r
ge commit 'v1
.
6
.
4
.
4-8-g8de6518'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Fix
mis-bac
k
p
or
t
of t
7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Update dra
f
t release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
amano
M
e
rge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Updat
e
draft rele
a
se notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Haman
o
Merge br
a
nch
'
d
p/maint-1
.
6
.
5-fast
-
import
-
non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hamano
M
erg
e
branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hama
n
o
Mer
g
e branch 'pc/uninteresti
n
g-submodule-disap
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
Me
r
ge branc
h
'
nd/include-termio
s
-fo
r
-osol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hama
n
o
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
M
erge branch 'jm/maint-1
.
6
.
5-
g
rep-NUL-terminate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
symlinks
.
c
:
remove unused functi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
obje
c
t
.
c: remove unused fu
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
uni
o
C
H
amano
Docum
e
nt that merge
strategies can
no
w
tak
e
th
e
ir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Ha
m
ano
Make "sub
t
r
ee" part
more orthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
pull: Fix p
a
rsing
o
f -X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Update d
r
aft release notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
a
n
o
Merge branch '
t
c/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
Merge branch '
j
h/com
m
it-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
M
erge bran
c
h
'
jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge branc
h
'jc/
m
aint-1
.
6
.
1-checkout-
m
-c
u
stom
-
merg
e
'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge
b
ranc
h
'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
Merge bra
n
ch 'tc/s
m
art-ht
t
p-res
t
r
i
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge b
r
anch 'jk/
r
un
-
c
o
m
mand-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
r
ge branch 'sr/gfi
-
options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
U
p
date C
O
PYING
w
i
th GPL
v
2 with new FSF
address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
u
s
er
_
ident_sufficien
t
l
y
_given():
r
e
fact
o
r the lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ide
n
t_sufficiently_given():
refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
mano
rerere: h
o
nor conflict-m
a
rker-s
i
ze attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
r
e
r
e
re: prepare for customi
z
a
ble conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
a
ma
n
o
commit
.
c::print
_
s
umma
r
y: do not release th
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Haman
o
c
o
nflict
-
m
a
rker-size: new at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
rerere: use ll_me
r
ge()
inste
a
d of using
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
man
o
merge-tree
:
us
e
ll_mer
g
e(
)
not
x
dl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
m
a
no
xdl_merge(): allow passing down marker_size in x
m
p
aram
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
xdl_merge
(
):
i
nt
r
od
u
ce xmparam_t f
o
r
merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
git_a
t
tr(): fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next