repo.or.cz
/
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 'jl/submodule-diff'
2010-01-23
Junio C Hamano
Me
r
ge branch
'
j
l/submo
d
ule-diff'
commit
|
commitdiff
|
tree
2010-01-23
J
u
n
io C Hamano
Merge
branch 'il/re
m
ot
e
-
u
pdates'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ha
m
ano
Merge branch
'
i
l/branch-set-u
p
stream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge branch
'jc/
m
aint-lim
i
t-n
o
te-outp
u
t'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio C Hamano
Merge branc
h
'nd/ls-files-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Haman
o
git-mv:
f
ix m
o
ving
m
o
re than
one source t
o
a
single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C Hamano
merge-rec
u
rsive: do not return NULL only to cause segf
a
u
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
F
ix "log --onelin
e
" not to show
n
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
conflict-mar
k
er-size: add test
and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Haman
o
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Ha
m
ano
Merge b
r
anch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
g
e
b
ranch '
j
c/chec
k
out-merge-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch
'ag/patch-header-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hama
n
o
Merge branch
'
j
c
/
c
o
n
f
lict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
Hamano
Mer
g
e branch 'a
g
/maint-app
l
y-to
o
-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Me
r
ge branch 'ap/m
e
rge-backe
n
d
-
opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch 'nd/status-partial-ref
r
esh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge
r
emot
e
branch 'rem
o
te
s
/
t
ras
t
-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge branc
h
'jh/note
s
' (early part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ham
a
no
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge bran
c
h 'jc/maint
-
r
efresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ha
m
ano
Fix "log" famil
y
not
t
o
be too a
g
res
s
ive about
s
h
o
w
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Haman
o
Me
r
ge branch 'rr/co
r
e-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
Me
r
ge branch
'jc/cach
e
-unm
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch
'
jc/
l
s
-
files
-
ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
ama
n
o
M
e
rge branch
'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge bran
c
h 'jc/maint-
s
t
r
b
uf-add-
f
ix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch
'mm/conflict-
a
dvice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
M
er
g
e branch 'd
a
/dif
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ran
c
h 'mh/rebase-fix
u
p
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'ns/
r
ebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge bra
n
ch 'mh/reb
a
se-fixup' (early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge bran
c
h 'il/push-set-upstr
e
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rg
e
b
r
anch
'
jk/warn-autho
r
-c
o
m
m
itte
r
-
after-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
Merge bran
c
h '
j
c/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'bk/fix-relative-git
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Merg
e
bra
n
ch
'sd/
c
d-p-show-top
l
e
vel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
erge branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
d
a
te
.
c: mark file-local fu
n
c
t
ion stat
i
c
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
J
unio 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 branch 'bg/mai
n
t-rem
o
te-update-de
f
ault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
rge b
r
a
nch 'sb/ma
i
nt-octopus' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge b
r
an
c
h
'bg/maint-add-all-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
erge bran
c
h
'
ma
i
nt-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge bran
c
h
'jk/maint-
1
.
6
.
5-rese
t
-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
tr/maint
-
1
.
6
.
5-
b
as
h
-
p
rompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Merge
branch 'dp/main
t
-1
.
6
.
5-fast
-
import-
n
on-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge branch 'jm/maint-
1
.
6
.
5-grep-NUL-terminate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Fix
"checko
u
t A
.
.
.
"
synonym for "checkout
A
.
.
.
HEA
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
status:
don't re
q
uire th
e
rep
o
sitory to be writa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merg
e
branch 'm
a
i
nt-1
.
6
.
4'
into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Me
r
ge branch
'
maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge bran
c
h 'maint-1
.
6
.
2' into
m
aint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Ha
m
a
n
o
Merg
e
comm
i
t
'v1
.
6
.
4
.
4-
8
-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
F
i
x mis-backport of
t
7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
Update
draft relea
s
e notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hama
n
o
Upda
t
e draft relea
s
e n
o
tes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Haman
o
M
erge branch 'dp/maint-1
.
6
.
5-fas
t
-
i
mport-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
M
e
rge branch
'
j
c/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge b
r
anch
'pc/uni
n
teresting-sub
m
odule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch
'nd/
i
nclude-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
M
erge br
a
nch '
j
s/
w
in
d
ow
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge branch '
j
m/maint-
1
.
6
.
5
-g
r
ep-NU
L
-
t
erminate
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
sy
m
l
i
nks
.
c: remove unused func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Hamano
o
b
j
e
c
t
.
c: r
e
move unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
uni
o
C Hamano
Do
c
umen
t
that merge
s
t
rat
e
gies can now take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
uni
o
C
Hamano
Make "subt
r
e
e
"
part more orthogonal
t
o the
r
e
st of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
p
u
ll:
Fix p
a
rsing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Update
d
raft releas
e
no
t
es
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o
C
H
am
a
no
Merge br
a
nch
'
tc/test-locate-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merg
e
branch 'jn/makefile
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
a
n
o
Merg
e
br
a
nch 'jc/maint-1
.
6
.
1-checko
u
t-m-custom-me
r
g
e'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
H
amano
Merge
branch 'tc/clone-v-p
r
ogress'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch 'tc/smart-http-restri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Mer
g
e branch 'jk/r
u
n
-command
-
u
se-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch 'sr/gfi-
o
ptions'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
mano
U
pdate COPYING with GPLv2 with new
F
SF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
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 Ha
m
ano
user_iden
t
_suf
f
icientl
y
_given():
r
efactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
re
r
er
e
: h
o
nor co
n
f
lict-marker-siz
e
attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hama
n
o
r
e
rere: pre
p
are for
customizable conflict mar
k
er l
e
ngth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
c
ommit
.
c::pr
i
nt
_
summar
y
:
d
o not relea
s
e t
h
e for
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
c
o
nfl
i
ct-marker-size: ne
w
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
rerere
:
use ll_merge() ins
t
ead
o
f
u
s
i
ng xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Ha
m
a
no
merge-tree: use ll_
m
erge() not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
xdl_merge(): allow pa
s
si
n
g down ma
r
ker_size in
xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
xdl_merge(): i
n
troduce xmparam_
t
for m
e
rge specif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
no
git_a
t
tr():
fix funct
i
on signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
man
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/re
s
et-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Tea
c
h
d
iff that modif
i
ed submodule directory
i
s dirt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
i
o
C Hamano
grep -
-
no-index
:
allow use of "git grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next