repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.bogomips.org/git-svn
2010-01-23
Ju
n
io C Ha
m
ano
M
e
rge git://git
.
bog
o
mips
.
org/gi
t
-
s
vn
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o C Hamano
Update dr
a
ft rele
a
se not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C Hamano
M
e
rge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io
C Hamano
Merge b
r
anch
'
jc/bran
c
h-d
'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C
H
a
mano
Merge
branch 'i
l
/rev-
g
l
ob'
commit
|
commitdiff
|
tree
2010-01-23
J
u
n
io C Hamano
Merge branch 'js/refer-upstrea
m
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge branch 'jl/submo
d
ule-d
i
ff'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
i
o
C Hamano
Merge bran
c
h 'il/remo
t
e-updates'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C Hamano
Merge
branc
h
'
i
l/bran
c
h-set-upstre
a
m
'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o
C Hamano
Mer
g
e br
a
nch 'jc/maint-limi
t
-note-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ha
m
ano
M
e
r
ge branch 'nd/ls-files-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Ham
a
no
i
g
nore du
p
l
i
cated s
l
ashes in make_relative_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Ham
a
no
git-mv: fix moving more tha
n
o
n
e sourc
e
to a
single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
me
r
ge-r
e
cursive: do not return N
U
LL on
l
y
t
o
cause se
g
f
ault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
F
i
x
"l
o
g
-
-oneline
"
not
to s
h
ow
n
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
conflic
t
-marker-s
i
ze: add tes
t
and d
o
cs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update draf
t
rele
a
se notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Hamano
Me
r
ge b
r
anch 'b
w
/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h 'jc/checkout-
m
erge-base
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch 'ag/patch-header-v
e
r
ify
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merg
e
b
ranch 'jc/c
o
nfl
i
ct-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hamano
Merge branch 'ag/maint-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C Hamano
Merge br
a
nch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge
b
r
a
nc
h
'nd/status
-
pa
r
tial-refres
h
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge remote
branch 'remotes/trast-doc/for-n
e
x
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
r
ge bra
n
ch 'jh/
n
ote
s
' (early
p
art)
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Haman
o
Mer
g
e branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
M
erge
branch
'
jc/ma
i
nt-
r
e
fresh-ind
e
x
-is-option
a
l-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Ham
a
n
o
Fix "log" family not to be too agres
s
ive about showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch
'
rr/core-tutor
i
al'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
M
e
rge branch
'jc/cache
-
unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
branch
'
js/exec-error-re
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
j
c
/
l
s-files-ignored-
p
ath
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
ano
Merge branc
h
'
j
c/grep-l
o
okahead'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Mer
g
e branc
h
'jc/mai
n
t-
s
trbuf-add-fix
-
doubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hama
n
o
Merg
e
branch
'mm/conflict
-
ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
H
amano
M
e
rg
e
branch 'd
a
/
difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Mer
g
e bran
c
h
'mh/rebase-
f
ixup'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Mer
g
e bran
c
h 'ns/rebase-auto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge
b
r
anch 'm
h
/rebase-f
i
xup' (early pa
r
t)
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
b
r
anch
'
i
l/push-set-
u
pstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'j
k
/warn-author-co
m
mi
t
ter-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge branch 'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Mer
g
e branch '
t
r/http-push-ref-status
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
g
e
bra
n
ch 'bk/fix-relative
-
gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Merge
b
r
a
nch
'
sd/cd-p
-
show-toplevel
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
erge br
a
nch 'jc/symbol-
s
ta
t
ic
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mark file-loc
a
l
fu
n
ct
i
on stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
S
y
n
c with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merge branch 'bg/main
t
-remote-update-
d
efaul
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
bran
c
h '
s
b/main
t
-octopus'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch
'bg
/
maint-add
-
all-doc
'
into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Haman
o
Merge branch 'maint-1
.
6
.
5' into ma
i
nt
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
unio C Ham
a
n
o
Merge bra
n
ch 'jk/main
t
-
1
.
6
.
5-reset-
h
a
rd'
int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge br
a
nch 'tr/maint-1
.
6
.
5
-b
a
sh-p
r
ompt-show-subm
o
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge branch 'dp/maint
-
1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
Mer
g
e branch 'jm
/
maint-1
.
6
.
5-g
r
ep-NUL-terminate
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Ham
a
no
Teach @{ups
t
r
e
am} synta
x
t
o strbuf_br
a
nchanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
t1506: mo
r
e te
s
t fo
r
@{upstream} sy
n
t
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Fix "checkout
A
.
.
.
" synonym for "chec
k
out A
.
.
.
HE
A
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
s
tatus: don't require
the repository to
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
Merge branc
h
'm
a
int-1
.
6
.
4' int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
no
Mer
g
e branch 'maint-1
.
6
.
3' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'ma
i
nt-1
.
6
.
2'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8-g8de
6
5
1
8' into
m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
F
i
x
mis
-
backp
o
rt of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update draft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update
d
raft rele
a
se n
o
t
e
s t
o
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch
'
dp
/
m
a
i
n
t-1
.
6
.
5-fast
-
import-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch '
j
c/rer
e
re'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C H
a
ma
n
o
Merge branch 'pc
/
uninteres
t
in
g
-
s
u
bmodule-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
Merge branch 'nd/in
c
lude-termios-for-os
o
l
'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ha
m
an
o
M
erge branch
'js/w
i
ndows'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge branch 'jm/ma
i
n
t
-1
.
6
.
5-grep
-
NUL-termina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symli
n
ks
.
c: re
m
o
v
e unused
f
unctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
object
.
c:
r
emove unused
f
u
n
ction
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C
Hamano
Docum
e
n
t
that
merge strategies can now take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subt
r
ee" part more orthog
o
nal to the res
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C H
a
mano
pu
l
l: Fix pa
r
sing of
-
X
<
option
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
U
pdate draft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
ama
n
o
Merg
e
bran
c
h 'tc
/
test-locate
-
httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Mer
g
e b
r
anch 'j
h
/co
m
m
it
-
s
t
a
t
u
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Mer
g
e
b
ranch 'j
n
/
makefile'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
Hamano
Merge branch 'jc/maint
-
1
.
6
.
1
-ch
e
ckout-m-c
u
st
o
m-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge br
a
n
ch 'tc/clone-v-pro
g
ress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
r
ge b
r
a
n
ch
'
tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jk/run-command
-
use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
rge br
a
nch '
s
r/gfi-op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ha
m
ano
Update COPYI
N
G with GPLv2 with new FSF a
d
dress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_suffic
i
ent
l
y_given(): refact
o
r t
h
e logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
amano
user_ident_
s
uf
f
iciently_given(): refactor the l
o
gic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
rerere:
honor co
n
fli
c
t-marker
-
size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erere: prepare for customizabl
e
conflict ma
r
ker
length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
commit
.
c:
:
print_summary: do not release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
conflict-marker-
s
ize: new attr
i
but
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next