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
Fix handle leak in sha1_file/unpack_objects if there were damaged object data
2008-09-03
Junio C Hamano
M
e
rge branch '
m
a
int'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Start 1
.
6
.
0
.
2
m
a
intenan
c
e cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
M
e
rg
e
br
a
n
ch 'nd/worktree' into maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
a
mano
Merge b
r
anch 'ho/dashless' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2008-09-03
Junio C Haman
o
Merge branch 'tr/
f
i
lter-branch'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Hamano
Merge branc
h
'np/maint-safer-
p
a
c
k'
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o
C
Ha
m
a
n
o
Merge branch
'rf/man-env'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C
H
amano
M
e
r
g
e br
a
nch
'jc
/
author-nickname'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Ham
a
n
o
Me
r
ge branch 'dp/pid-u
i
ntmax'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
M
e
r
ge
b
ranch 'np/maint-s
a
fer-
p
ack
'
i
n
to np/pac
k
commit
|
commitdiff
|
tree
2008-09-01
Junio
C Ha
m
ano
git-
m
e
rge documentation: describe how c
o
nflict is pr
e
sented
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
J
uni
o
C Hamano
checkout --conflict=<styl
e
>
:
recre
a
te merge i
n
a non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio
C
Haman
o
Merge branch '
t
r/re
v
-list-docs' into tr/filter-bran
c
h
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
M
erg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C
H
a
m
ano
git-add --intent-to-add
(-N)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
'gi
t
foo'
pro
g
ra
m
i
d
entifi
e
s its
e
lf without dash
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
H
amano
g
it
c
ommit --
a
uthor=$name:
l
ook $na
m
e u
p
in exist
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Haman
o
diff: var
y
default pre
f
ix depen
d
ing on w
h
at
a
re co
m
pared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
di
f
f: Help
"l
e
ss
"
hide ^M from the output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gitat
t
ributes: -c
r
lf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io
C
H
amano
checkou
t
-m: r
e
create
m
erge when checking o
u
t of
unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
Hama
n
o
Merge b
r
anch '
j
c/mai
n
t-checkout
-
fix' into 'jc/be
t
ter
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io
C
H
amano
git-m
e
rg
e
-recu
r
si
v
e:
l
earn to
honor
m
erge
.
conf
l
ictsty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Ha
m
an
o
merge
.
conflictstyle:
c
ho
o
s
e
betwe
e
n "me
r
ge
"
and "
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Ham
a
no
re
r
ere:
u
nderstan
d
"diff
3
-m"
styl
e
c
onflicts wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
rerere
.
c: use
symbolic
constants to
keep track of parsing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio
C
H
amano
xmerge
.
c: "diff3 -m" st
y
l
e c
l
ips merge reduction level
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
xme
r
ge
.
c:
m
i
nim
u
m readabili
t
y f
i
xups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
xdiff-me
r
ge: optionally sho
w
c
o
nflicts in
"diff3 -
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hama
n
o
xdl_fill_merge_buff
e
r(): sep
a
rate out a too deeply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
check
o
ut --ours/
-
-theirs: allow
checking out one si
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
c
heckout -f: allow ignori
n
g
u
nmerged pa
t
hs when checki
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
che
c
kout: do
no
t
check
o
ut
unmerged hi
g
her
s
t
a
ges
r
andomly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
mano
Merge branch 'jc/post-simplif
y
' (earl
y
part
)
into tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
git-appl
y
: Loos
e
n "match
_
beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
Fix example in git-name-rev document
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
Merge
b
ranch 'sp/m
i
ssing-
t
hin-
b
ase' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Merge bran
c
h 'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
mano
Merge bra
n
ch 'af/m
a
int-install-no-handl
i
n
k
' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
shell:
d
o
not pl
a
y duplicat
e
d defin
i
tion gam
e
s to
s
hrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Merge
b
ranch '
n
p/veri
f
y
-
pack' in
t
o
m
aint
commit
|
commitdiff
|
tree
2008-08-29
Ju
n
io C Hamano
Mer
g
e b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge branch 'mv/merg
e
-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio
C
H
a
mano
M
erge branch
'
m
l
/
s
ubmod
u
le'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Haman
o
Me
r
g
e branch 'am/cherry-
p
ick-rerere
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
Merge branch 'np/verif
y
-pack'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge branch 'da/submodule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hama
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hamano
c
t
ype
.
c:
p
rotec
t
tiny C
preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hama
n
o
Merge branch
'af/maint
-
insta
l
l-
n
o
-
handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
branch '
j
c/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch
'
m
a
i
nt
'
commit
|
commitdiff
|
tree
2008-08-26
Juni
o
C Haman
o
dae
m
on
.
c: minor 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
R
evert "Build-in
"git-shell""
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
Merge
branch 'jc/no-slim-
s
hell'
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
M
e
rge bra
n
ch
'maint' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio 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 b
r
anch 'ag/maint-combine-diff-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Ha
m
ano
Merge branch 'm
v
/ma
i
nt-merge-fix' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hama
n
o
t7606: fix custo
m
merge te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge:
f
ix numeru
s
bugs arou
n
d
"t
r
ivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
unp
a
c
k_tre
e
s
(
)
: prot
e
ct the handcrafted in-core
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
J
u
nio C Ham
a
no
discard_cache: reset
lazy name_hash bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
unio C Hamano
t
empla
t
e
s
/Makefi
l
e: install is un
n
ecessar
y
, just us
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
ma
n
o
M
erge bra
n
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hama
n
o
Me
r
ge br
a
nch 'ml/
s
ub
m
odu
l
e
-
foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'pm/l
o
g-exit
-
code'
commit
|
commitdiff
|
tree
2008-08-21
J
unio
C H
a
mano
Merge branch 'sb/commi
t
-tre
e
-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
rge branch
'
p
b
/r
e
fl
o
g-d
w
im'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Me
r
ge
b
r
a
nch
'
jc/a
d
d
-
stop-at-
s
ymlink
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hamano
M
e
rg
e
branch 'kh/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C Haman
o
M
e
rge branch
'
mg/count-obj
e
cts'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C
H
amano
Merge branch
'mz/push-verbo
s
e'
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 Ham
a
n
o
Merge branch 'cc/mer
g
e-ba
s
e-
m
any'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio
C
Hamano
M
e
rge branch
'jc/test-de
e
per'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e br
a
nch 'js
/
p
aralle
l
-
t
e
s
t
'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
F
i
x "git-merg
e
-s bo
g
o" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
Update dra
f
t
release notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
an
o
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
Update draft release notes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
Hamano
"gi
t
-
merge": allow fast-forwar
d
ing in
a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
completi
o
n: find
o
ut supported merg
e
strategies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Ha
m
ano
for-
e
ach-ref
:
c
o
pe
w
ith
tags
wi
t
h incomplete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C
H
ama
n
o
diff --check: do
n
ot get confused by ne
w
blank
l
i
nes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
Buil
d
-
in "git-shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
a
mano
Merg
e
branch 'bd/
d
iff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
Merg
e
branch 'dp/h
a
sh-literal
l
y'
commit
|
commitdiff
|
tree
2008-08-20
J
u
ni
o
C Hamano
M
e
rge branch
'
js/checkout
-
dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge b
r
anch '
p
h
/enable-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Me
r
ge branch
'jk/pager
-
swap'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C
Hamano
Merge branch
'
rs/i
m
ap'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Merge branch 'js
/
mingw-sta
t
'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
s
h
e
ll: do not pl
a
y duplicated de
f
inition g
a
mes
to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
u
nio C Ham
a
n
o
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
compat: intro
d
uce on_d
i
sk_byt
e
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next