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
t6021: add a new test for git-merge-resolve
2008-07-13
Mik
l
os Vajna
t6021: a
d
d a new test for git-m
e
rge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Hamano
Tea
c
h merge
.
log t
o
"git-m
e
rge" ag
a
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
Buil
d
in mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-merge-p
u
ll-
c
onfig
.
sh on AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-commit-tree:
m
ake it
u
sable from other built
i
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case t
o
ensu
r
e git-merge pr
e
p
e
n
ds th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add new test case to e
n
sure git
-
m
e
r
ge
r
educes octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio
C Hamano
Int
r
o
d
uc
e
reduce_head
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Juni
o
C Hamano
Introd
u
ce ge
t
_m
e
rge_bases_many()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
n
a
Add
new
t
est to ensure git
-
merg
e
handl
e
s more than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_o
c
to
p
us_merge_bases() in
c
ommit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
git-
f
mt-
m
e
r
ge-m
s
g
:
m
ake
i
t
usable fro
m
other builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move r
e
ad_cach
e
_un
m
e
rged() to read-
c
a
c
h
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
A
d
d new test
t
o ensure gi
t
-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
Va
j
na
Move pa
r
s
e-options's s
k
i
p
_p
r
efix() to git-compat-ut
i
l
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
M
o
ve co
m
mit
_
list_
c
ount()
t
o
c
ommit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s
V
ajna
Move split_cm
d
line()
to ali
a
s
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
B
rian Gernh
a
rdt
Add te
s
t res
u
lts director
y
to t/
.
git
i
gnore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff Kin
g
doc/rev-par
s
e: cla
r
ify re
f
log vs -
-
un
t
il for s
p
e
cify
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C
Hamano
Update
d
raft release not
e
s for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@u
c
hicago
.
edu
Documentation: don't assume gi
t
-sh-setup and gi
t
-pars
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Ju
n
i
o
C
Hamano
t97
0
0: skip when Test::More is not available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio
C H
a
man
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-29
Eric
W
ong
git-svn: don
'
t
s
a
nitize re
m
o
te n
a
mes
i
n c
o
nfi
g
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier
M
arin
show_st
a
ts
(
): fix
s
t
a
ts
w
idth calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Ol
i
v
ier Marin
D
o
cum
e
ntation: rem
o
v
e {show,whatchange
d
}
.
d
i
f
f
tree
config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery
P
ennarun
git-svn: a
v
oid filling up
t
he dis
k
with temp
f
i
les
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björ
n
Steinb
r
ink
g
it cat-file:
F
ix memor
y
leak in batch m
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
o
ey Hess
fix git conf
i
g
exa
m
ple syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jochen
V
oss
avoid off-by-
o
ne error
in run_upl
o
ad_archive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
G
IT-VERSION-GEN: do not
f
ail if
a
'HE
A
D' file exi
s
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johannes
Schindelin
comm
i
t-tree
:
lift completely a
r
bit
r
a
ry limit of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dm
i
try Potapov
shrink git-shell
b
y av
o
iding redundant d
e
pendencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Ch
r
istia
n
Co
u
der
h
elp: check early i
f
we have a command, if not
t
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Docum
e
nt
t
he double-das
h
"rev -
-
pat
h
" di
s
a
m
bi
g
uator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted
P
e
rcival
Don't use dash commands (git-foo) in tuto
r
ial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiemann
test-lib
.
s
h
: s
h
ow git
i
nit output when in
verbose mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
u
nio C Ham
a
no
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Junio
C
Hamano
Merge bra
n
ch 'maint-1
.
5
.
5'
i
nto maint
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Hama
n
o
GIT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ham
a
no
Merge bra
n
c
h 'maint-1
.
5
.
4
' into
m
aint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
u
ni
o
C Hamano
git-shell
:
accept "git
f
oo" fo
r
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Haman
o
diff
--
c
heck: do no
t
discard
error status upo
n
seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff King
improve for-each
-
ref test s
c
ript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jin
g
Xu
e
A
d
d 'git
-
p4
.
allowSubmit'
t
o
g
it-p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o
C
H
a
mano
St
a
rt draf
t
releas
e
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmitry Potapo
v
u
p
da
t
e-hoo
k
-ex
a
mple
:
optionall
y
allow non-fast-forward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Al
e
x Riesen
Fix u
s
e
of "perl
-i" on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C H
a
mano
GIT 1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
mano
M
e
r
ge
b
ranch 'sb
/
reb
a
s
e
'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hama
n
o
Me
r
g
e
b
r
an
c
h 'lw
/
gitweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge
b
r
anch 'lt/
c
onfig
-
fsync'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io
C Hamano
Merge branch
'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ham
a
no
Merge branch 'jh/clone-packe
d
-refs'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C
H
amano
Mer
g
e branch '
l
w/
p
erlish'
commit
|
commitdiff
|
tree
2008-06-25
D
m
i
t
r
y
P
o
tap
o
v
f
ix
u
p
date-hook-example
to work wit
h
packe
d
tag references
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
e
ff King
c
lone: create
intermediate di
r
ectories of destinat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branc
h
'jc
/
m
a
int-combine-d
i
ff-pre-context' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
i
o
C H
a
mano
Merge branch 'lt/m
a
int-gi
t
dir-relative' into m
a
int
commit
|
commitdiff
|
tree
2008-06-25
Junio C
Ham
a
no
Mer
g
e branch 'sb/maint-reba
s
e' into m
a
int
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-e
a
ch-ref: implement missing tag values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
Pi
t
re
v
erify-
p
ack: test for detection o
f
index v2 obj
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
verify-pack
:
ch
e
ck packed object CRC when using index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
i
col
a
s Pitre
move
s
how_pack_info() where it be
l
o
n
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
i
cola
s
P
i
tre
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
clo
n
e: create intermediate dir
e
c
t
o
ries of destinati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
mano
Ship sample hooks with
.
sample suffi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
am
a
no
pre-rebase hook u
p
d
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
las Pitre
refactor pa
c
k stru
c
ture allocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
t
est
c
ase for
p
ack r
e
silience agai
n
s
t corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nico
l
as Pitre
i
mplement so
m
e res
i
li
e
nce again
s
t
p
a
c
k corrupt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
call ini
t
_p
a
ck_revindex()
l
azily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Jun
i
o C Hamano
Merg
e
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-06-24
J
a
n Krüger
git-
s
vn
:
m
a
ke rebuild
r
espect
rewriteRoot option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
P
a
t
r
ick Higgins
Workaround
f
or AIX mkstem
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
M
ichele Ballabio
t930
1
-fast-export
.
sh: R
e
m
o
v
e
debug line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torvalds
Shrink the git binary a bit
by avo
i
ding unn
e
cessary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Junio
C Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
Exten
d
parse-option
s
test suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
a
p
i-pa
r
se-o
p
tions
.
txt: Introduce documen
t
ation for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Balla
b
io
parse
-
op
t
io
n
s
.
c
:
fix
do
c
ument
a
tion syntax o
f
optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan B
e
yer
api-
b
ui
l
tin
.
txt:
u
p
date and
f
i
x
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
git-reba
s
e
.
sh: Add check if r
e
base i
s
in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
Beyer
t3404:
stricter tests
f
o
r
git-r
e
bas
e
--interac
t
ive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
t
e
phan
Beyer
api-bui
l
t
in
.
tx
t
:
updat
e
a
nd fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ha
m
a
no
M
erge branch 'rs/a
r
chive-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hamano
Merge b
r
anch 'lt/racy-empty'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C
H
amano
M
e
rge br
a
n
c
h
'sn/st
a
tic
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'jc
/
maint-c
o
m
b
ine-diff-pre-con
t
ex
t
'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C H
a
mano
M
e
r
g
e bran
c
h 'lt/maint-
g
itdir-relative'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
H
a
ma
n
o
M
erge b
r
anch
'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Hamano
Merge branch 'pb/fast-export'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge br
a
nch 'mo/
s
tatus-untr
a
cked'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ha
m
ano
Merg
e
branch 'k
h
/update-ref'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o
C Ha
m
ano
Merge branch 'jn
/
web'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Hamano
Merge branch
'
rg
/
gitweb'
commit
|
commitdiff
|
tree
2008-06-21
Sha
w
n
O
.
Pearce
Correct documen
t
ation for git-pus
h
--mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next