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
Merge branch 'il/remote-updates'
2010-01-23
Junio
C
Hamano
M
e
r
g
e bra
n
ch 'il/remo
t
e-
u
pdates'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C
Hamano
Merge branch 'il/
b
ranch-s
e
t-upstream'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o C Hamano
M
erge br
a
nch 'jc/
m
aint
-
limit-no
t
e-
o
utput'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge bra
n
ch '
n
d/ls-file
s
-sparse-fix
'
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Hamano
g
it-mv: fix mov
i
ng more than
one source
to a s
i
ngle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
i
o
C Hamano
Merge branch '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io
C
Hamano
merge-re
c
u
rsive: do no
t
return NULL only to cause se
g
fault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
mano
F
i
x "l
o
g --onelin
e
" not to
sh
o
w
note
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
n
o
conflict-m
a
rker-size: ad
d
test and do
c
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ha
m
ano
Update dra
f
t releas
e
notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branch 'bw/
c
vsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge branch 'jc/chec
k
ou
t
-m
e
rge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'ag
/
patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
a
mano
Merge bran
c
h 'jc/conf
l
i
ct-mark
e
r-size
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
anch
'
ag/maint-appl
y
-too-large
-
p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Me
r
g
e
branch 'ap/
m
erge
-
back
e
nd-op
t
s
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'nd/stat
u
s-parti
a
l-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
remote branch 'remotes
/
trast-doc/for-ne
x
t'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
Hamano
Merge branch 'jh/not
e
s
' (early part)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
amano
Me
r
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C
Hamano
Merg
e
branch 'jc/main
t
-re
f
resh-index-is-
o
pt
i
onal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
F
ix "log" family not to
b
e
too agressi
v
e about s
h
ow
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e bra
n
ch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/c
a
che-un
m
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
M
e
r
ge bra
n
ch 'js/exec-error-repor
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C
H
a
m
a
no
M
erge br
a
nch 'jc/
l
s-fi
l
es-i
g
n
o
red-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Merge br
a
nch 'j
c
/grep-loo
k
ahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge b
r
anch 'jc
/
maint-strbuf-add
-
fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'mm/c
o
nf
l
ict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge bra
n
ch 'da/difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'mh/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
a
n
o
Merge
b
r
a
nch
'
ns/r
e
bas
e
-auto
-
squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/reba
s
e-fixup'
(
early pa
r
t)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
a
m
ano
Merge branch 'il
/
push-
s
et-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Me
r
ge branch 'jk/warn-a
u
thor-c
o
m
m
itter-af
t
er-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Mer
g
e branch 'jc/ide
n
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge b
r
anch 'tr/http-push-re
f
-s
t
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
b
k
/
fix-re
l
ative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
M
erge branch 'sd/cd-p-s
h
ow-t
o
ple
v
el'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/
s
ym
b
ol-static'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
date
.
c: mar
k
file
-
local
f
unction
s
ta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Sync
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
Junio
C
Ham
a
no
Merge branch
'bg
/
maint-r
e
mote-update-defa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge br
a
nch '
s
b
/
maint-
o
c
t
opus'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C H
a
mano
Merge branch 'bg
/
maint
-
add-al
l
-doc'
into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
M
e
rge
branch 'maint
-
1
.
6
.
5' in
t
o
m
a
in
t
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
Junio C Hamano
Merge
b
ranch 'jk/ma
i
n
t
-1
.
6
.
5-reset-hard'
int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
M
e
r
ge b
r
anch 'tr/maint-1
.
6
.
5-bash-p
r
o
m
pt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge branch 'dp/mai
n
t-1
.
6
.
5
-fast-
i
mport-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge branch
'
jm/maint-
1
.
6
.
5-grep-NUL-termi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Fix
"checkou
t
A
.
.
.
" s
y
nonym
for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
status: don't require the repository to b
e
wri
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
rge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Mer
g
e
branch 'm
a
i
nt-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Ha
m
ano
M
e
rge branch 'main
t
-1
.
6
.
2' int
o
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C
H
a
man
o
M
e
rg
e
com
m
it 'v1
.
6
.
4
.
4-8-g8
d
e6518'
i
n
t
o m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Fix mis-back
p
ort
of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Upd
a
te draft release n
o
te
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Update
draft
release
no
t
es to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge bran
c
h 'dp/mai
n
t-1
.
6
.
5-fast-import-
n
on
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge
branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Mer
g
e
b
ranch 'pc/
u
ninteresting-submodu
l
e-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch 'nd/
i
nclude-termios
-
for
-
osol
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Haman
o
Merge bran
c
h 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rg
e
b
r
anch 'jm
/
mai
n
t
-1
.
6
.
5-gr
e
p-NUL-term
i
nate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
sy
m
links
.
c: remove
u
nu
s
e
d fu
n
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C
H
a
mano
object
.
c
:
r
emove unus
e
d fun
c
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
D
o
cumen
t
that merge str
a
tegi
e
s
c
an now tak
e
thei
r
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C H
a
m
ano
M
a
k
e
"subtree"
p
art more orth
o
gonal
t
o
the re
s
t of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
pull: Fix parsing
of -X
<
option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C
Ha
m
ano
Update d
r
aft re
l
ease n
o
tes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C Hamano
Merg
e
branch 'tc/test
-
locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Mer
g
e branch 'jh/commit
-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
M
e
r
ge
b
ra
n
ch
'jn/makef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
g
e
branch 'jc/maint-1
.
6
.
1-checko
u
t
-m-c
u
s
t
om-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bra
n
ch 'tc/
c
lone-v-progre
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
a
mano
Mer
g
e
b
ranch 'tc/
s
mart
-
http-restri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
n
o
Merge
branch 'jk/
r
un-co
m
ma
n
d-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
a
man
o
Merge branch 'sr/gfi
-
o
p
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Updat
e
COPYING with GPLv2
w
ith n
e
w FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
am
a
n
o
user_i
d
e
n
t
_
sufficiently_given(): refa
c
tor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_s
u
ffici
e
ntly_
g
iven(): r
e
fa
c
tor the l
o
gi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
n
o
rerere: honor confl
i
ct-ma
r
ker-size attr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
rerere: pr
e
pa
r
e for c
u
stomiz
a
b
l
e confli
c
t m
a
r
k
er length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
co
m
mit
.
c::
p
rint_summ
a
ry: do
n
ot release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict
-
mar
k
er
-
size
:
new
attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
use ll_merge() inst
e
a
d of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
me
r
ge-tree: use l
l
_mer
g
e() not x
d
l_m
e
rg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
xdl_
m
e
rg
e
(): allow passing down marker_si
z
e in
xm
p
ara
m
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
aman
o
xdl_m
e
rge(): i
n
troduce xmp
a
ra
m
_t
f
or merge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
git_attr(): fix function
s
ignature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
n
o
M
erge branch
'
c
c
/reset-more
'
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io
C
H
am
a
no
gre
p
--no-index: al
l
ow use of "g
i
t grep" outside
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C
H
a
mano
grep: p
r
epare
t
o r
u
n outside of a work
t
re
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Haman
o
Me
r
ge b
r
anch 'jc/c
h
e
cko
u
t
-
m
e
rge
-
bas
e
'
commit
|
commitdiff
|
tree
next