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
Add a new test for git-merge-resolve
2008-07-13
Miklos Vajna
Ad
d
a new
test
for
git-
m
erge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021
:
add a new te
s
t for
g
it-
m
erg
e
-reso
l
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Hamano
Teach
m
erge
.
log
to "
g
it-merge" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
Bui
l
d in merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Fix t
7
601-m
e
rge-p
u
l
l
-config
.
sh on AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
git-comm
i
t-tree: make it usable fr
o
m other b
u
il
t
in
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Add new te
s
t
case
to en
s
ure git-merge
prepend
s
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Ad
d
n
e
w
test case
t
o ensur
e
git-mer
g
e r
e
duces octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Juni
o
C Hamano
Introduce
r
educe_head
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Juni
o
C Hamano
Introduce g
e
t_merge_
b
ases_
m
any
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test
t
o
ensure git-me
r
ge
h
and
l
es more than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
I
ntroduce g
e
t_octopus_merge_bases(
)
in c
o
mmi
t
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
git-f
m
t-mer
g
e-msg:
m
a
k
e
i
t us
a
bl
e
from othe
r
builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove read_cache_unmerged() to re
a
d-cache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test t
o
ensure
g
it-merge handle
s
pull
.
tw
o
head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Mov
e
par
s
e
-
options's ski
p
_pre
f
ix() to git-comp
a
t-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
ajna
Mov
e
commit_list_count() to commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move split_cmd
l
in
e
() t
o
alias
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
u
nio C Hamano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2008-06-30
Bri
a
n Gernhardt
A
d
d te
s
t
results di
r
e
c
tory to t/
.
g
itignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
d
o
c/rev-par
s
e: clari
f
y reflog vs
-
-
un
t
il for spec
i
fying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Update draft relea
s
e notes for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnie
d
er
@
uchica
g
o
.
edu
D
o
cum
e
ntation: don't ass
u
me git-sh-
s
etup and git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
unio C Ha
m
a
n
o
t9700: sk
i
p when Test::More is not avai
l
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio C Hamano
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
git-svn:
don't
s
anitiz
e
remote
names
i
n
c
onfig
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivi
e
r Mar
i
n
show
_
stat
s
():
fix stats width ca
l
culation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Mar
i
n
Documentation: re
m
ove {show,wha
t
changed}
.
d
i
fftree
c
onfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
A
v
e
r
y Pen
n
arun
git-svn: av
o
i
d filling
up t
h
e disk wi
t
h tem
p
file
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björn S
t
einbri
n
k
g
it ca
t
-file
:
Fix memory leak
i
n ba
t
c
h mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
o
ey Hess
fix git config example syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jochen Vo
s
s
avoid
o
ff-b
y
-on
e
error in run_
u
ploa
d
_arc
h
ive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea
W
iemann
GIT-V
E
RSI
O
N-GEN: do not fail if a 'HEA
D
'
fil
e
e
x
ists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johann
e
s Sch
i
ndelin
com
m
it-tr
e
e
:
lift com
p
letely arbitrary limit of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potap
o
v
shrink git-
s
hell
b
y avoidi
n
g
redund
a
nt dependencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
C
hri
s
ti
a
n Couder
help: check early if we
have a command, if
n
ot try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Document the double-das
h
"
rev
-
- path" disambigu
a
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
T
ed Percival
Don't use das
h
commands (git-foo) in tutorial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiemann
test
-
lib
.
sh: sh
o
w git init
output
w
h
en
i
n
v
e
r
bose mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
un
i
o C H
a
m
ano
Merge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Hamano
Merge bran
c
h 'maint-1
.
5
.
5
'
i
nto
maint
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
G
I
T
1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o C
Ham
a
no
Merge bra
n
ch 'm
a
int-1
.
5
.
4' into mai
n
t
-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Junio C Haman
o
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C Haman
o
git-shell: accept "
g
it foo" f
o
rm
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C Hamano
diff
--c
h
eck:
do
n
o
t
discard error status upon
s
eeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff Ki
n
g
improve for-
e
ach-ref
t
est scrip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xue
A
dd 'git-p4
.
al
l
owSubmi
t
' to
g
it-
p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C Hamano
Start draft re
l
e
a
se notes
f
or 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
D
m
itry Potapov
update
-
hoo
k
-exampl
e
: opti
o
nally
allow non-fast-forward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex
R
iesen
Fi
x
u
se o
f
"perl -i" on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
GIT 1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge
b
ranch 'sb/rebase'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Ha
m
ano
Merge b
r
anc
h
'lw
/
g
i
tweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
mano
Merge branch 'l
t
/config-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
M
e
rge branch
'
s
r/test
s
'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ham
a
n
o
Me
r
g
e
branch
'
jh/c
l
one-packed-refs'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C Hamano
Merge branch 'lw/perl
i
sh
'
commit
|
commitdiff
|
tree
2008-06-25
D
mitry Potap
o
v
f
ix update-hook-exampl
e
to
work
with packed tag re
f
erences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
eff
K
in
g
clo
n
e: cre
a
t
e intermediate
directories of destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ham
a
no
Merg
e
b
ran
c
h
'jc/maint-combin
e
-
d
if
f
-
pre-context' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hamano
Merge branch 'l
t
/
maint-gitdir-
r
elat
i
ve' into maint
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C Hama
n
o
Merge b
r
a
n
ch 'sb/ma
i
nt-r
e
base' into ma
i
nt
commit
|
commitdiff
|
tree
2008-06-25
J
e
f
f
Ki
n
g
for-each-ref: imp
l
ement missing t
a
g val
u
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
ol
a
s P
i
tre
verify-
p
ack: test f
o
r detection of index
v2
object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
las Pitre
verify-pack: ch
e
ck
packe
d
object CRC when us
i
ng in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
i
colas Pitre
m
ov
e
s
how_pack_info() where
i
t
belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
icolas
P
i
t
re
optimiz
e
v
e
rify-p
a
ck a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
cl
o
n
e
: c
r
eate intermediate director
i
es
of dest
i
nat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Ship sa
m
ple
hooks
with
.
s
a
mple suf
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C
H
am
a
n
o
pre-rebase hook update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
r
efactor pack structur
e
alloc
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nico
l
as Pit
r
e
test case for
pack resi
l
i
ence
a
g
a
inst corrup
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
Pitre
i
mplement some
r
e
silience agai
n
s
t
pack cor
r
uptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
N
icolas P
i
tre
call init_pack_rev
i
ndex() lazily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Ju
n
io C Haman
o
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2008-06-24
Jan K
r
üger
gi
t
-svn: make rebuild respect rewriteRoot option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higgins
Wo
r
k
a
roun
d
for A
I
X mkstemp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
t9
3
01-fast-e
x
port
.
sh
:
R
emove debug
l
ine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
L
i
nus
T
orvalds
Shrink the
git binary a bit by av
o
i
d
ing unnecessa
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
J
u
nio C H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beyer
Extend pa
r
se-option
s
test
s
uite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
B
eyer
api
-
pars
e
-op
t
i
ons
.
txt:
Introd
u
ce documentat
i
on for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Mic
h
ele Ball
a
bio
par
s
e-optio
n
s
.
c: fix documentation syntax of
o
ptional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
Beyer
api
-
b
ui
l
tin
.
txt: update
and fix ty
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han Be
y
er
git
-
rebase
.
sh: Add
c
hec
k
i
f r
e
base is in
progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
t
ephan Beyer
t3404:
s
tri
c
ter tests for
git-rebase--interactiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
api-
b
uiltin
.
txt: up
d
ate an
d
fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
H
amano
M
e
r
g
e br
a
nch 'rs/archive-igno
r
e'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hamano
Merge branch '
l
t/ra
c
y-em
p
ty
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Hamano
Merge bran
c
h 'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Mer
g
e br
a
nch
'
j
c/maint-comb
i
ne-diff-pre-context'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Hamano
Me
r
g
e
branch 'lt/maint-
g
it
d
ir-rel
a
ti
v
e'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Hamano
M
er
g
e b
r
anc
h
'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
amano
M
erge bran
c
h 'pb/fas
t
-export'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Ha
m
ano
Mer
g
e
b
ranc
h
'
m
o/status-untr
a
cked'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Hamano
M
erge branch
'kh/upda
t
e-ref'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hamano
Mer
g
e
bran
c
h
'
jn/web'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Hamano
Merge branch 'rg/g
i
tweb'
commit
|
commitdiff
|
tree
next