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 ne
w
test for git-me
r
ge-resolve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
lo
s
Vajna
t6021: a
d
d a
n
ew test for gi
t
-
merge-r
e
solv
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
Junio
C
Hamano
Teach mer
g
e
.
log to "git-merge" again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s
V
ajna
Build in merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los Vajn
a
Fi
x
t7601-merge-pull-config
.
s
h
on AIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
git-commit-tre
e
: make it usable fr
o
m oth
e
r builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
dd
new
t
e
s
t case to
e
n
s
u
re gi
t
-merge prepends the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new test case to
e
nsure git-
m
erge
reduc
e
s
octopu
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
i
o
C
H
amano
Introduce redu
c
e_heads()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
io C Hamano
Introduce get_merge_bases_many()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
A
d
d new test
t
o ensur
e
g
i
t-merge handle
s
mo
r
e
than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
Vajna
Introduce get_
o
ctopus_m
e
rge_ba
s
es()
i
n commit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
git-fmt
-
m
e
rge-msg
:
make it usa
b
l
e
from oth
e
r builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Mo
v
e read_cache_unmerge
d
() to read-cac
h
e
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add n
e
w tes
t
t
o ensure git-merge h
a
ndles pull
.
tw
o
head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
jna
Move p
a
rse-opti
o
ns's s
k
ip_prefix() to gi
t
-c
o
mpat-util
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Mov
e
commit_li
s
t_cou
n
t
(
) to c
o
m
m
it
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move split_cmdli
n
e(
)
t
o alias
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Merge
bra
n
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-30
B
rian
Ger
n
hardt
Add test resu
l
ts directory to
t/
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev-
p
a
r
s
e: c
l
arify
re
f
log
v
s
--unt
i
l fo
r
sp
e
ci
f
ying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
J
unio C H
a
mano
Updat
e
dr
a
ft relea
s
e note
s
for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
j
r
n
ieder@uchicago
.
ed
u
Docume
n
t
a
t
ion: don't assume git-sh-
s
etup and g
i
t-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
J
unio
C
Ham
a
no
t9700: ski
p
when Test::
M
or
e
is
not avai
l
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
J
u
nio C Ham
a
no
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-29
Eri
c
Wong
git-
s
v
n
: don't
s
an
i
tize
r
e
mote n
a
mes in c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
show_stats(): fix stats w
i
dth
ca
l
c
u
latio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Oli
v
i
er Mari
n
Documentati
o
n: remove {show,whatchan
g
ed}
.
d
i
fft
r
ee config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
A
v
ery Penn
a
r
u
n
gi
t
-svn: av
o
id
f
illing
up the
dis
k
with te
m
p files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Björn
Steinbrin
k
gi
t
cat-file: F
i
x memory leak in batch mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
f
ix git config exa
m
pl
e
syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Jochen Voss
a
void off-by-one error in r
u
n_u
p
load_a
r
c
h
ive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT-V
E
RSION
-
G
E
N: do not f
a
il if a 'HEAD' file
e
xists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Schindelin
c
o
mmi
t
-tree
:
lift completely ar
b
itrar
y
li
m
it of
1
6
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
shrink git-shell by avoiding
redundant dependencie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
C
hristian Couder
help: check earl
y
i
f we have a comman
d
,
if not try
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C Hamano
Document the double-das
h
"re
v
-- path" disambiguator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ted Per
c
ival
Don't
use
dash command
s
(git-fo
o
)
in tutorial-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
L
e
a Wiemann
test-lib
.
sh: show git init ou
t
pu
t
wh
e
n in verbose
mo
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C Hamano
Mer
g
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C
Hama
n
o
Merge branch 'ma
i
nt-1
.
5
.
5' into m
a
int
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C Ham
a
no
G
I
T
1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merg
e
br
a
nch 'm
a
int-1
.
5
.
4' into maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Junio C
Haman
o
G
I
T 1
.
5
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
g
i
t
-shell: acc
e
p
t "gi
t
f
o
o
" form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
H
amano
diff --check: do not discard
error
status up
o
n s
e
eing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
eff King
improve for-each-ref test
s
cri
p
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
ing Xu
e
Add
'
git
-
p4
.
allo
w
Submit' to git-p4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ha
m
ano
S
t
art d
r
a
f
t re
l
ease
notes
for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
D
m
i
try Po
t
apov
u
pdat
e
-hook-example
:
optionall
y
allow non-f
a
st-forwa
r
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-06-26
Alex Riesen
Fix u
s
e of "
p
er
l
-
i
" on
W
indows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o
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 branch 's
b
/rebase'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
i
o C Hamano
Merge branch 'lw/gi
t
web
'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Merg
e
branch 'lt/c
o
nfig-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Ha
m
a
n
o
Merge br
a
nch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge b
r
anch
'
jh/clone-pa
c
ked-refs'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
Merge
br
a
nc
h
'
l
w
/p
e
rl
i
sh
'
commit
|
commitdiff
|
tree
2008-06-25
D
m
it
r
y Potapo
v
fix up
d
ate-hook-e
x
a
m
ple to wor
k
with
pac
k
ed tag
references
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
e
ff
King
clone: c
r
eate
i
ntermediate direc
t
ories o
f
d
estination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ha
m
ano
Merge
branch 'jc/maint
-
combine-diff-pre-context' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
J
unio
C
Hamano
Merge branch '
l
t/maint-gitdir-
r
elative' in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-06-25
J
unio C Hamano
Me
r
ge branch '
s
b/maint-rebase' into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-each-ref: implement missing tag v
a
lues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
verify-
p
ack: test for detection of
i
ndex v2 object
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pit
r
e
verify-p
a
ck:
c
heck packed object C
R
C when
usin
g
i
ndex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
i
colas Pi
t
r
e
mov
e
show_pack_
i
n
f
o() wh
e
re it
b
elong
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nico
l
a
s Pitre
op
t
i
m
ize verify-pack a bit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
c
lo
n
e: create int
e
r
m
ed
i
a
te direc
t
ories of destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hama
n
o
Ship sample hooks
w
i
t
h
.
sample suffi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hama
n
o
pre-rebase ho
o
k
updat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
las Pitre
refa
c
tor pack structure
a
llocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pitr
e
test case
for pack resilie
n
ce again
s
t corrup
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
im
p
lement
some resi
l
ience against pack corruptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
call init_pack_revindex() lazi
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Juni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüger
git-svn: make rebuild r
e
spect r
e
wr
i
teRoot op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
P
a
trick Hi
g
gins
Work
a
round f
o
r
AIX m
k
stemp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
M
ichele Ballabio
t9
3
0
1
-fa
s
t-expor
t
.
s
h: Remo
v
e deb
u
g
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torvalds
Shrink the git binary a
b
it by avoiding unnecessary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Junio C H
a
mano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
S
tephan Beyer
Ext
e
n
d parse
-
option
s
te
s
t su
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
ap
i
-parse-options
.
tx
t
: Introduce docu
m
e
ntation for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Mi
c
h
ele
B
a
llabio
parse
-
options
.
c
:
f
ix
d
o
cumentation syntax
of opti
o
nal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
api-buil
t
in
.
txt: upd
a
te and fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Step
h
an
B
eyer
git-re
b
ase
.
sh: A
d
d check if rebase i
s
i
n progre
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
t
eph
a
n Be
y
er
t3404: stricter tests for git-rebase--interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Step
h
an Beye
r
a
p
i-builtin
.
txt: up
d
ate and fix ty
p
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'r
s
/archive-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branc
h
'lt/racy
-
empty
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Mer
g
e
branc
h
'
s
n
/static'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Hamano
Merge branch 'jc/
m
aint-c
o
mbine-
d
if
f
-pre-context'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ham
a
no
Merge branch 'lt/
m
a
in
t
-
gitd
i
r-rel
a
ti
v
e'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o C Haman
o
Merg
e
branch 'jk/t
e
s
t'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge br
a
nch 'pb/fast
-
export'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge b
r
an
c
h '
m
o
/status-untr
a
cked'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio
C Ha
m
ano
Mer
g
e branch 'kh/
u
p
d
a
te-ref'
commit
|
commitdiff
|
tree
2008-06-22
J
u
ni
o
C H
a
ma
n
o
Merge
br
a
n
c
h
'
jn
/
we
b
'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Ham
a
no
Merge
b
ranch 'rg
/
g
i
twe
b
'
commit
|
commitdiff
|
tree
next