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
reduce_heads(): thinkofix
2008-07-13
Sve
r
re Hvammen Joh
a
n
sen
reduce_heads():
t
h
ink
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s
V
aj
n
a
Add a new t
e
st for git-merge-res
o
l
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
t60
2
1
:
a
d
d
a new t
e
st for git
-
merge-resolv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Jun
i
o C Ha
m
an
o
Teach merge
.
log
t
o "git-merge" aga
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos
Vajna
Build in merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601
-
m
e
rge-p
u
ll-confi
g
.
sh on AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
git-
c
ommit
-
tr
e
e: make
i
t
usabl
e
f
r
om ot
h
e
r
builtin
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Add new
test ca
s
e to ensure git-merge prepend
s
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add ne
w
test
c
ase to ensure
g
i
t
-merge
r
e
duces octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio
C
H
a
man
o
I
n
troduce reduce_h
e
ads()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Introduce get_m
e
rge_
b
as
e
s_many()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new
t
est to ensur
e
git-me
r
g
e handles more than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Intro
d
uce get_o
c
topus_m
e
rge_bases
(
) in 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 usable fr
o
m
other builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move rea
d
_cache
_
unmer
g
ed() to read-cache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
new test
t
o e
n
sure git-merge h
a
ndles pull
.
two
h
ead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
pars
e
-
options's
s
ki
p
_pref
i
x(
)
to gi
t
-co
m
pat-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Move comm
i
t_list_count() to
c
ommit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Mo
v
e split
_
cmdline
(
) to alias
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Mer
g
e bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-06-30
Bria
n
G
ernhardt
Add test result
s
director
y
to
t
/
.
gitig
n
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Je
f
f King
doc/r
e
v-parse: clarify re
f
l
og vs --until
f
or specifyin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
U
p
date draf
t
rele
a
se notes fo
r
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jr
n
i
e
der@uchicago
.
edu
D
o
cumentatio
n
: don't assume git-sh-set
u
p and
g
it-pars
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
u
nio C Hamano
t9700: sk
i
p when T
e
st::More is
n
ot
avai
l
ab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
J
unio C H
a
mano
M
e
r
ge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-06-29
Eric W
o
ng
git-
s
vn: do
n
't
s
aniti
z
e
r
emote names
i
n config
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
a
rin
sho
w
_stats(
)
: fix
stats wid
t
h
c
alculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
Documentation: remove {show,whatchanged}
.
d
ifftree c
o
nfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery P
e
n
n
arun
git-svn: avoid fi
l
ling
up the disk with temp fil
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björ
n
S
tei
n
brink
git
cat-file: Fix mem
o
ry leak in batch mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
fix git config example syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
o
chen Voss
avoid of
f
-
b
y-one e
r
ror
i
n run_upload_archi
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Le
a
Wiem
a
nn
G
IT-VERS
I
ON-GEN: do
n
ot
fail if a 'HEAD' file exis
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Schindelin
commit-tree: lift compl
e
tely
arbitrary limit of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
D
m
it
r
y Potapo
v
shrink git-shell
b
y a
v
oidi
n
g redundant
d
e
pe
n
denci
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
C
h
ri
s
t
i
a
n
C
o
uder
hel
p
:
check early if we have a c
o
mm
a
nd, if
n
ot
t
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ha
m
ano
Docum
e
nt the double-dash "rev -
-
pa
t
h"
disambiguator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted Pe
r
c
i
v
al
D
o
n't use
dash commands (g
i
t-foo) in tutorial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
L
ea Wieman
n
test
-
l
i
b
.
sh: show g
i
t init o
u
tput when in
v
e
rb
o
se mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Me
r
ge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ham
a
no
Merge
b
ranch 'maint-1
.
5
.
5
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C H
a
ma
n
o
G
IT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
u
nio
C Hamano
Merg
e
branch 'maint-1
.
5
.
4'
i
nto
m
aint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
J
unio
C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C Hamano
git-shell
:
a
c
cept "git foo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C
H
ama
n
o
diff --c
h
eck: do
n
ot discard err
o
r st
a
tus upon seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Je
f
f
Kin
g
i
m
prove fo
r
-each-ref
t
est
s
cript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
i
ng Xue
Add 'git-p4
.
allowSubm
i
t' to
g
it-
p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C
Ha
m
an
o
S
tart d
r
aft releas
e
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmi
t
ry
P
ota
p
ov
update-hook-examp
l
e: optionally allow non
-
f
a
st-f
o
rward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o
C
Hama
n
o
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex Ri
e
s
en
Fix use of "perl
-
i" on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C Hamano
GIT 1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C
H
amano
Merge branch
'
sb/rebase'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C Ham
a
no
Merge branch 'l
w
/git
w
eb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branc
h
'
lt/config-fsync'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hama
n
o
Merg
e
branch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
i
o
C Haman
o
Merge branch 'jh/c
l
o
n
e
-pack
e
d-ref
s
'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Ha
m
ano
Merge branch
'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Potapov
fix upda
t
e-h
o
ok-example
to work with packed tag
references
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Je
f
f King
clo
n
e: create intermedi
a
te direct
o
ries o
f
des
t
ination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Hamano
Merg
e
bran
c
h 'jc/maint-combine-diff-pre-cont
e
xt' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C
H
am
a
n
o
M
e
rge branch 'lt/m
a
int-gitdir-relative' into mai
n
t
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
m
a
n
o
Merge branch 'sb/maint-rebase' into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-e
a
ch-re
f
: imple
m
en
t
missing ta
g
values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pi
t
r
e
verify-pack: te
s
t
f
or detecti
o
n of index v2 object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
tre
verify-pack
:
c
heck p
a
cked
obj
e
ct CR
C
wh
e
n using index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicola
s
Pitre
move sho
w
_
p
ack_in
f
o() where it belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
olas Pitre
o
p
timize verify-pack a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
ef
f
K
i
ng
clone
:
create
inte
r
mediate d
i
rectories o
f
de
s
tination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
S
h
i
p samp
l
e hooks with
.
samp
l
e suffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C Haman
o
pre
-
reba
s
e hook updat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
refactor pa
c
k structure allocat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pit
r
e
test case
for pack resilience against co
r
rup
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Ni
c
olas Pitre
implement
s
ome
r
esilien
c
e against pack corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
N
icolas Pit
r
e
cal
l
init_pac
k
_revindex() laz
i
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Junio C Hamano
Me
r
ge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüge
r
git-sv
n
: mak
e
rebuil
d
respect
r
e
write
R
o
o
t
opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higgins
Wo
r
karound for AIX mkstemp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Miche
l
e Bal
l
abio
t9301-fa
s
t-export
.
sh: Remove debug line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linu
s
Torvalds
Shrink
t
he
g
it binary a bit by a
v
o
i
d
i
ng unnece
s
sary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Ju
n
io C Ham
a
no
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan
Be
y
er
Extend parse-optio
n
s test
sui
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
a
p
i-
p
arse-options
.
txt: Introduce documenta
t
ion for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Mi
c
hele Ball
a
bi
o
parse-o
p
tions
.
c: f
i
x docum
e
ntation syntax of optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
t
e
p
h
an Beyer
api-
b
uil
t
i
n
.
txt: updat
e
and fix t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
Beyer
gi
t
-rebase
.
sh: Add chec
k
if reba
s
e is in p
r
o
g
res
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
Beyer
t3404:
s
tricter tests for git-rebase--inter
a
ctive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
B
eyer
ap
i
-builtin
.
txt: upd
a
te
a
n
d
fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ha
m
ano
Merge
bran
c
h
'
rs/arch
i
ve-
i
gnore'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hama
n
o
M
e
rge branch 'lt/
r
a
c
y-
e
mpty'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C H
a
mano
Merge
branch 'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Ha
m
ano
Me
r
ge branch
'
jc/maint-combine-diff-pre-c
o
ntext'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge branch 'lt
/
maint-gitdir
-
re
l
ati
v
e'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C
H
amano
Merge branch
'
j
k
/
t
est'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C
H
a
mano
Merge
bra
n
ch
'
pb
/
f
a
s
t
-
e
xp
o
rt'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C
Hamano
Merge br
a
nch 'mo/status-u
n
tracked'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge branch 'kh/update-r
e
f'
commit
|
commitdiff
|
tree
2008-06-22
J
unio
C
Hama
n
o
Mer
g
e
branch 'jn
/
web'
commit
|
commitdiff
|
tree
next