repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-08-31
Junio C Haman
o
Merge
branc
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
gitatt
r
i
b
u
tes: -crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
git-apply: Loosen "match_b
e
ginning"
l
o
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fix example in git
-
n
a
me-
r
ev d
o
cum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch '
s
p/mi
s
sing-thin-base' int
o
maint
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
Me
r
ge branch 'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
m
ano
Merge bra
n
ch
'af/maint-in
s
tall-
n
o-handl
i
nk'
into m
a
int
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
ama
n
o
shell: do
n
ot p
l
ay duplicated defi
n
ition games to
s
hri
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
Merge branch 'np/ve
r
ify-pack
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2008-08-29
Juni
o
C H
a
m
an
o
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2008-08-28
J
unio C Hamano
Merge branch 'm
v
/merge
-
custom'
commit
|
commitdiff
|
tree
2008-08-28
Jun
i
o C Ham
a
n
o
Merge branc
h
'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge
b
ranch 'am/cherry-pick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Me
r
ge b
r
a
n
ch 'jc/
a
dd-addremo
v
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge
b
ranch 'np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Hamano
M
erge branch 'da
/
s
u
bmodu
l
e-
s
ync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hama
n
o
Mer
g
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hamano
c
t
yp
e
.
c
:
p
rotect tin
y
C preprocessor
c
o
n
stants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C
Ham
a
n
o
Merg
e
branch
'
af/maint-in
s
t
all
-
no-
h
and
l
ink'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Ha
m
ano
Merge
b
ranch 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
a
mano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
daemon
.
c: m
i
nor style fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio
C
Hamano
Revert "Build-in "gi
t
-shell""
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
Merge branch 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
Merge branch '
m
aint' to
s
y
nc with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
GI
T
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
i
o
C
H
amano
Merge branch
'
ag/m
a
i
nt-combine-di
f
f-fix' into main
t
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
Merge br
a
nch 'mv/maint-me
r
g
e-fix' into
m
aint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
t
7
6
06
:
fix custom merge
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
Merg
e
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C
H
a
man
o
merge: fix nu
m
erus bugs arou
n
d "trivial
mer
g
e" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpack_trees(): protect the h
a
n
d
crafted in-core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
tem
p
lates/Makefil
e
:
install
is
u
nnecessary, ju
s
t u
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
M
erge branch 'ml/submo
d
u
l
e-fo
r
each'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge b
r
anch 'pm
/
log-e
x
it-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge bran
c
h 'sb/com
m
it-
t
ree-minileak
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merge b
r
an
c
h 'pb/r
e
flog-
d
wim'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Mer
g
e branch 'jc/ad
d
-
s
t
op-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio
C Ha
m
ano
Merge br
a
nch 'kh/dif
f
-tre
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'mg/count-objects
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
ge
b
r
anch '
m
z/push-ve
r
bose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge
branch 'j
c
/
index
-
extende
d
-flags'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C
Ham
a
no
M
erg
e
branc
h
'cc/merge-
b
ase
-
man
y
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
no
Merge branc
h
'
j
c/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C
Ha
m
ano
Merg
e
b
r
a
n
ch 'js
/
parallel-t
e
st'
commit
|
commitdiff
|
tree
2008-08-21
J
unio
C Hamano
F
ix "
g
it-merge -s
bogo" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C Haman
o
Update draft relea
s
e notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Upd
a
te draft re
l
ease n
o
t
e
s for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"git-
m
erge
"
: allow fast-for
w
arding in a s
t
a
t
-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C H
a
m
a
n
o
c
o
mplet
i
on: find out
supporte
d
m
erge strategies
correctl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
for-ea
c
h
-ref:
c
ope with tag
s
wit
h
i
nc
o
mplet
e
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
dif
f
-
-
check: do not get
c
onf
u
sed by new b
l
a
nk
l
in
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
i
o
C
H
a
mano
Build-in "
g
it-shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
i
o
C
H
ama
n
o
Merge
branch
'b
d
/diff
-
strbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C H
a
mano
M
e
rge branch 'dp/hash-l
i
terally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'js/ch
e
ckout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
Merge bra
n
ch '
p
h/
e
n
able-thr
e
ad
e
d'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hama
n
o
Merge
branch
'
jk/pager-swa
p
'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Merge bran
c
h 'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge
branch 'js/mingw-stat'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C Hamano
shell
:
do
not pla
y
duplicate
d
definition gam
e
s
to s
h
rink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio
C Hamano
compat: introduce
o
n_disk_b
y
tes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
n
io
C Hamano
Start 1
.
6
.
1 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Ham
a
n
o
Start
1
.
6
.
0
.
X
mainte
n
ance
s
e
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Ha
m
ano
M
e
rge git
-
gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
J
uni
o
C Ha
m
ano
M
e
rge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
J
u
n
io C Ha
m
a
no
tests: use $TEST_DIRECTORY to refer to the
t
/ directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Hamano
index: f
u
ture proof for "extended" index ent
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
amano
Merge
g
it://git
.
kernel
.
o
r
g/pub/scm/g
i
tk/
g
it
k
commit
|
commitdiff
|
tree
2008-08-14
J
u
nio C Hamano
xdiff-interface: hide t
h
e w
h
ole "xdiff_emi
t
_
s
tate"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio
C
Hamano
M
e
r
ge branch
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ha
m
a
no
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
unio C Hamano
Mer
g
e bran
c
h '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C
H
amano
D
o not tal
k
abou
t
"diff" in rev-list documentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge g
i
t://git
.
bogomi
p
s
.
org/gi
t
-
svn
commit
|
commitdiff
|
tree
2008-08-12
J
unio C Hamano
d
i
ff --check: do not unconditional
l
y co
m
pl
a
in a
b
out
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Ha
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Re-fix rev-list-options documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-11
J
u
n
io C Hamano
Fix delet
i
ng reflog entries fr
o
m HEAD reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Ha
m
ano
U
p
date draft RelNotes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
J
u
nio C Hama
n
o
Merg
e
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio C
Hamano
mai
l
info: fix MIM
E
multi
-
part mess
a
g
e
boundar
y
ha
n
dl
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
J
unio C Hamano
G
I
T-VERSION-GEN: mar
k
the ver
s
i
o
n
'dirty
'
only if there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio
C Hamano
asciidoc m
a
rkup fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Junio
C Haman
o
Merge branch 'lt/config-fs
y
nc' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-07
J
unio C H
a
mano
Merge branch
'
jc
/
reflog-e
x
p
i
re' into main
t
commit
|
commitdiff
|
tree
2008-08-07
J
u
nio C
Hamano
Merge branch
'
ag/rewrite_one' into maint
commit
|
commitdiff
|
tree
2008-08-06
Junio C
H
a
m
ano
GIT 1
.
6
.
0-rc
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
J
unio C Ham
a
no
G
I
T
1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
unio C Hamano
Files given on th
e
c
ommand line
are relative to $cwd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Ham
a
n
o
Merge git://r
e
p
o
.
o
r
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2008-08-06
Junio C H
a
mano
Merge
g
it://git
.
kern
e
l
.
or
g
/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-06
Juni
o
C Hama
n
o
M
erge
b
ra
n
ch 'rs/archive-
p
arse-
o
ptions'
commit
|
commitdiff
|
tree
next