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
Junio C Hamano
Merge git://g
i
t
.
bogomips
.
o
rg/git-s
v
n
commit
|
commitdiff
|
tree
2010-01-23
Junio C Haman
o
Up
d
at
e
draft release n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Ha
m
ano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-23
J
u
n
i
o
C Hama
n
o
Merg
e
bra
n
ch 'j
c
/branc
h
-d'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C Ha
m
an
o
M
e
rge
branch 'il/
r
e
v
-glob
'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C
H
a
m
ano
M
e
rge bra
n
c
h
'js/re
f
er-upstream'
commit
|
commitdiff
|
tree
2010-01-23
J
un
i
o C
Hamano
Me
r
g
e
branc
h
'
j
l/su
b
module-diff'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Haman
o
Merge branch 'il/remote-u
p
dates'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
i
o
C Ha
m
ano
Merge branch 'il/branch-set-upstream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Haman
o
Merge
bra
n
ch 'jc/maint
-
limit
-
note
-
outp
u
t'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io
C Hamano
M
erge
branch 'nd/
l
s-file
s
-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
ignore
duplicated slas
h
es in mak
e
_relativ
e
_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
git-
m
v
: fix m
o
ving more
t
h
a
n one source to
a sing
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Haman
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Haman
o
merge-recursive: do n
o
t return NUL
L
only to caus
e
segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
F
ix
"log
-
-onelin
e
"
not t
o
show
no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ha
m
ano
c
o
nflict
-
marker-size: add
t
est and
d
ocs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Update draft release no
t
es to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'bw/
c
vsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Ha
m
ano
Me
r
ge bra
n
ch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hama
n
o
Merge br
a
nch '
a
g/patc
h
-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Me
r
g
e bra
n
ch 'jc/co
n
f
lict-ma
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merg
e
branch
'
a
g
/maint-a
p
ply-too-larg
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C H
a
mano
Me
r
g
e
br
a
n
ch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
r
g
e branch 'nd/st
a
t
us-p
a
r
t
ia
l
-
r
efresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
m
a
no
Mer
g
e
r
e
m
ote branch 'remotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jh/notes'
(
e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C H
a
mano
Merge br
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
branch '
j
c/maint-ref
r
esh-inde
x
-is-optional-f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Fix "log" family
n
o
t
to be too agr
e
ssive about showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merg
e
branch 'rr/core
-
tuto
r
ial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Ha
m
ano
M
e
rge bran
c
h 'j
c
/ca
c
he-unme
r
ge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merge branch 'js
/
exec-error-repo
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
M
erge branc
h
'jc/ls-files-igno
r
ed
-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bra
n
ch 'jc/
g
re
p
-looka
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C H
a
ma
n
o
M
erge branch 'jc/maint-strbuf-a
d
d
-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
e
r
ge br
a
nch 'mm/conflict-
a
d
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch 'da/di
f
ftool
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
erg
e
bran
c
h
'
m
h
/
rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io
C
Hama
n
o
Merge
b
ranch 'ns/reba
s
e-auto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge
b
ranch 'mh/re
b
a
s
e
-fixup' (e
a
rl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
Merge
b
ranch 'il/push-set-upstrea
m
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
bran
c
h 'jk
/
warn-auth
o
r-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Ham
a
no
Merge b
r
anch
'
j
c
/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branch 'tr/http-push-ref-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'b
k
/fix-relative-gitdir-fi
l
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
M
e
rge branch 'jc
/
symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
d
a
te
.
c
:
mark
file
-
local
function st
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
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 Hamano
Merge bran
c
h 'bg/mai
n
t-re
m
ote
-
update-
d
efault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Merge
branch 'sb
/
maint-octopus'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge branch 'bg/main
t
-
add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bra
n
ch 'ma
i
nt-1
.
6
.
5' into mai
n
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 Haman
o
Me
r
ge branch
'jk/
m
a
int-
1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'tr/maint-1
.
6
.
5-ba
s
h-prompt-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'dp/
m
aint-1
.
6
.
5-fas
t
-import-non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e branch 'jm/maint-1
.
6
.
5-grep-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
T
e
ach @{upstream} syntax to
s
trbuf_branc
h
anm
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
t
1506: more t
e
st for @{upstream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Fix
"
c
h
ecko
u
t
A
.
.
.
" synonym
f
or "checkout
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
stat
u
s: don't require the r
e
pository to b
e
writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
e
rge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
amano
Merge b
r
anch 'maint-1
.
6
.
4'
i
nto maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge bra
n
ch 'maint-1
.
6
.
3' i
n
to main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ha
m
ano
Merge
bran
c
h '
m
aint-1
.
6
.
2'
into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge commit 'v1
.
6
.
4
.
4-8-g8de65
1
8' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Fi
x
mi
s
-
b
ackport of t7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Update
d
r
aft releas
e
notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
a
mano
Update draft release no
t
e
s
to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
man
o
Me
r
g
e
branc
h
'dp/
m
ain
t
-1
.
6
.
5-fas
t
-import-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C H
a
mano
M
e
r
g
e branch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ham
a
no
Mer
g
e branch 'pc/uninterestin
g
-
submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge
b
ranch
'
n
d/include-termios-
f
or
-
o
so
l
'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Haman
o
Merge branch 'js
/
w
indows'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ham
a
no
Mer
g
e b
r
an
c
h
'jm/maint
-
1
.
6
.
5-grep-NUL-t
e
rmi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
ano
symlinks
.
c: remove unused f
u
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c: re
m
ove
unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C H
a
m
a
no
Document
t
hat merge str
a
teg
i
es can now take
th
e
ir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
M
ake "subtree" pa
r
t more o
r
t
hogo
n
al t
o
t
h
e rest
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
pull: Fix parsing
o
f -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update draft
r
elease
n
otes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C H
a
mano
Merge bra
n
ch
'
tc/test-l
o
cate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merge branch 'jh/commi
t
-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge
b
ranch 'jn
/
m
akefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Hamano
Merge branch 'jc/maint
-
1
.
6
.
1
-
checkout-
m
-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch 'tc/
c
lone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/smart-http-restrict
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
Me
r
g
e branch 'j
k
/r
u
n-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge b
r
anch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
U
pdate C
O
PYING with GP
L
v2 w
i
t
h new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
user_ident_suff
i
ciently_given(
)
: refact
o
r the lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
user_ident_sufficiently_given
(
):
r
e
f
actor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor
c
o
nfl
i
ct-mar
k
er-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere: pr
e
par
e
for
c
ustomizab
l
e
c
onflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
a
mano
com
m
it
.
c::print
_
summary:
d
o
n
ot releas
e
the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
conflict-marker-size: n
e
w attr
i
bu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next