repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/no-slim-shell'
2008-08-27
Junio
C
Hamano
Merge b
r
anc
h
'
j
c/no-slim-s
h
e
l
l
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-26
J
u
nio C
Hamano
Revert
"
Bu
i
ld-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io
C Hamano
Merge
b
ra
n
c
h
'
jc/no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
Merge br
a
n
c
h
'mai
n
t' to s
y
n
c
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
G
I
T 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Mer
g
e
branch
'
ag/m
a
i
n
t-c
o
m
bine-d
i
ff-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
n
o
M
e
rge branch 'mv/maint-merge-fix' into
m
ain
t
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Haman
o
M
erge b
r
an
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-08-24
J
unio
C Hamano
merge
:
fix numerus bugs aro
u
nd "tri
v
ial m
e
rge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
unpack_trees(): pro
t
e
c
t the handcr
a
fted in-core ind
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C
H
amano
templ
a
tes/Mak
e
f
i
le
:
instal
l
is unnecessar
y
, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch
'
ml/submodule
-
f
oreach'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merge branch 'pm/log
-
e
xit-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge branch 'sb/commit-tree-minil
e
ak'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Merge branch 'pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge b
r
a
nch
'jc/add
-
stop-at-
s
y
m
link'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merge bra
n
ch 'kh
/
di
f
f-tre
e
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
ni
o
C
H
amano
Merge b
r
anch 'mg/coun
t
-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge b
r
anch 'mz/
p
ush-verbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'jc/index-exten
d
e
d-flags'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
ma
n
o
Me
r
ge bran
c
h '
c
c
/
m
e
rge-base-ma
n
y'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
io C Hamano
M
e
rge branch 'jc/test-d
e
eper'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
n
o
Merge
b
r
a
n
ch 'js/parallel-test'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
U
p
date draft re
l
ease notes
for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o C Hamano
Update draft
r
e
leas
e
notes for
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"gi
t
-
merge": allow
fast
-
for
w
arding in
a
stat-d
i
r
ty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
completion: fi
n
d out supp
o
rte
d
merge
str
a
tegies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
fo
r
-each-re
f
: cop
e
with tags with
i
nco
m
plete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff -
-
c
h
eck:
do not get c
o
n
fused by new b
l
ank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Build-in "git-sh
e
ll"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge bran
c
h
'
bd/diff-st
r
buf'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge bra
n
c
h
'dp/has
h
-lit
e
rall
y
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge branch '
j
s/checkout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
m
a
no
Merge
b
ranch 'ph/ena
b
le-
t
hreade
d
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge b
r
a
nch 'jk/
p
a
ger-swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
M
erge
b
ran
c
h 'rs/im
a
p'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge
br
a
nc
h
'js/mingw-stat'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
shell: do n
o
t play duplicated definition
g
ames to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
u
nio C Haman
o
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-19
Juni
o
C Hama
n
o
compat: introduc
e
o
n
_disk_by
t
es()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio
C H
a
mano
Start
1
.
6
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Ham
a
no
Start 1
.
6
.
0
.
X mainte
n
ance serie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
uni
o
C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merg
e
g
i
t-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
a
m
an
o
Merge br
a
nch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C
Hamano
tests: use $TEST_DIRECTOR
Y
to refe
r
to
t
h
e t
/
d
irectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
n
io
C
H
amano
index:
futur
e
pro
o
f for
"
e
x
tended
"
ind
e
x entri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C
Haman
o
Merge
git://git
.
kerne
l
.
or
g
/pub/sc
m
/g
i
tk/gitk
commit
|
commitdiff
|
tree
2008-08-14
Jun
i
o C Hamano
xdif
f
-inter
f
ace: hide t
h
e whole "xdiff_
e
mit_sta
t
e"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Ha
m
ano
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C
Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
io C Hama
n
o
Do not talk abou
t
"
dif
f
"
i
n r
e
v-list documen
t
a
ti
o
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Haman
o
Me
r
g
e
g
it://git
.
bogo
m
i
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
diff --c
h
e
ck
:
do not unconditionally complain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio
C Hamano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-11
Junio C H
a
mano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio
C
Haman
o
Re
-
fix rev-list-o
p
ti
o
ns
d
ocumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio
C Hama
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-11
J
unio C Hamano
Fix delet
i
ng re
f
log entr
i
es fr
o
m HEAD re
f
log
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Haman
o
Up
d
ate draft RelNotes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
Merge branch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2008-08-09
Junio C Ham
a
no
mailinfo:
f
i
x
M
IME multi-pa
r
t message
bou
n
dary
h
a
ndling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C
Hamano
GIT-VERSI
O
N
-
GEN: mark the version 'dirty
'
o
nly
if the
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Ha
m
ano
a
s
ciidoc markup
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Ju
n
i
o
C
H
amano
M
erge bran
c
h 'lt/config-fs
y
n
c
' int
o
maint
commit
|
commitdiff
|
tree
2008-08-07
Ju
n
io C Hamano
Mer
g
e
b
ra
n
ch 'jc/reflo
g
-expire' into maint
commit
|
commitdiff
|
tree
2008-08-07
J
unio C
H
a
mano
Merge branch 'ag/rewrite
_
o
n
e' into maint
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
GIT 1
.
6
.
0
-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C
Hamano
Sync
with 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io
C
Ha
m
ano
GIT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
u
n
io C Hamano
Files give
n
on the c
o
m
m
a
n
d line a
r
e re
l
a
t
iv
e
to $cwd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Juni
o
C Ham
a
no
Merge gi
t
://repo
.
o
r
.
c
z
/gi
t
-gu
i
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Hamano
Merge g
i
t://
g
i
t
.
kernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Hamano
Merge branch 'rs/arc
h
ive-parse-options'
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o C Hamano
fix
diff-t
r
ee --stdin do
c
umentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-06
Junio
C Haman
o
RelNotes 1
.
5
.
6
.
5 updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-05
Junio C Hamano
add: ref
u
se to add workin
g
tree i
t
ems beyond sym
l
i
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-05
J
unio C H
a
mano
u
pdate-index: refuse to a
d
d worki
n
g tre
e
items beyond
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-03
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio
C Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Hamano
b
u
ilt
i
n-name-rev
.
c: split dee
p
ly nested part from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io
C
H
amano
Start 1
.
5
.
6
.
5 RelN
o
te
s
to describe accumu
l
a
ted fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio
C Hamano
U
p
date my e-ma
i
l a
d
d
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
J
unio
C Ha
m
a
no
Docu
m
entation:
c
larif
y
dif
f
-
-
cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
J
unio C Ham
a
no
make sure parsed wildcard
r
e
f
spec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-31
Jun
i
o C Hamano
Teach --
f
in
d
-
c
o
pies-harde
r
t
o
"git blame"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C H
a
m
ano
Fix te
s
t
-
parse-
o
ption
s
"int
e
ger" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hama
n
o
Fix merge name g
e
neratio
n
in "m
e
rge
i
n C"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
git
-
merge-octopus:
u
s
e
(m
e
rg
e
-base A (
m
erge B C
D
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C
H
amano
Merge git://re
p
o
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ham
a
no
Teach g
i
tlinks
t
o
ie_modif
i
ed(
)
and ce_modified_check_fs(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C
Haman
o
m
e
rge-ba
s
e-many: add tr
i
vial tests based
o
n the documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Ju
n
io C Hamano
docume
n
tatio
n
:
merge-base: expla
i
n "git merge-base
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
u
nio C H
a
mano
t7001: f
i
x
"
git mv" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next