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
Miklos Vajna
t
6021: add a new test for git-m
e
rge-re
s
ol
v
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
Jun
i
o C Hamano
Teach merge
.
log to "git-merge" again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Va
j
na
Build in merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
F
ix t7601-merge-pull-config
.
sh on
A
IX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commi
t
-tree: make it
u
sable from o
t
her builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Va
j
na
Add new test case to en
s
ure git-m
e
r
g
e
prepends th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd n
e
w
t
est ca
s
e
t
o
e
nsure git-merge reduces octopus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
io C
H
a
mano
Introduce reduce_heads()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Ha
m
ano
I
n
troduce get_merge_bases_
m
any
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new tes
t
t
o
e
nsu
r
e
g
it-merge hand
l
es
m
ore than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
a
jna
Introduce get_oc
t
opu
s
_merge_bases() in commit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
g
it-f
m
t-me
r
ge-msg: make it usable f
r
om o
t
he
r
builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
jna
Move re
a
d_cache_u
n
merged() to
re
a
d-c
a
che
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
V
ajn
a
Add new test to ensu
r
e git-mer
g
e handles pu
l
l
.
t
w
o
h
ea
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move pa
r
s
e-opt
i
ons
'
s skip_pref
i
x() to git-
c
ompat-util
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jna
Move commit_
l
ist_count() to
c
o
mmi
t
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Mo
v
e s
p
li
t
_
cmdline() to al
i
a
s
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
Brian Gernhard
t
Add test re
s
ults dir
e
ctory to t/
.
g
itignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
J
eff
K
ing
doc/rev-pars
e
: clarify ref
l
o
g
vs
--un
t
il
for specifying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
J
u
nio C Hamano
U
p
date dra
f
t relea
s
e
n
o
t
es for
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
jrnied
e
r@uchicago
.
edu
Documentation: don't as
s
ume
g
it
-
sh-setup and git-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Ju
n
io C Ha
m
a
no
t9700: s
k
i
p whe
n
Test
:
:
M
o
re
i
s no
t
a
v
ailable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Junio C Hamano
Merge
branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
gi
t
-svn: don't
s
a
ni
t
ize remote n
a
mes in config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
show_stats():
f
i
x stats width calcula
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivi
e
r Marin
Documentat
i
on: remove
{
s
how,whatchanged}
.
difft
r
ee
confi
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pe
n
narun
git-svn: avoid f
i
l
ling up the disk with
temp
f
iles
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Björn Steinbr
i
nk
git ca
t
-file: Fix me
m
o
ry leak in batch mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
J
oey Hess
f
i
x gi
t
co
n
fi
g
example
synta
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joch
e
n V
o
ss
avoid off-by-on
e
error
i
n
run_upload_
a
rchive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
G
I
T-VERSION-G
E
N: do not
f
ail if a 'HEAD' file exists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johannes
S
chind
e
li
n
commit-tree: lift co
m
pletely a
r
bitr
a
r
y
li
m
it
of 16
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
D
mitry Po
t
ap
o
v
s
h
rink
g
it-shell
b
y
a
voidi
n
g redun
d
ant dependenc
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
C
h
rist
i
an C
o
uder
h
e
lp: che
c
k
earl
y
if we have
a
comm
a
nd, if
not tr
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
D
o
cument the double-dash "rev
-
-
path" disambiguator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ted Percival
Don
'
t use d
a
sh c
o
mmands (
g
it-foo) i
n
t
utorial-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
L
e
a Wiemann
test-li
b
.
sh: show g
i
t init outp
u
t whe
n
in verbose
m
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hama
n
o
M
e
rge
b
ra
n
ch 'maint-1
.
5
.
5
'
into maint
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C
Hamano
GIT 1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Me
r
ge branc
h
'maint-1
.
5
.
4' into
m
aint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
J
u
n
i
o
C Ham
a
no
GI
T
1
.
5
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
git-shell:
accept "git foo" form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
diff --check: do not
d
iscard error s
t
atus upo
n
seei
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
eff
King
improve for-eac
h
-ref
t
est scr
i
pt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Ji
n
g
X
ue
Add 'git-p4
.
allowSubmit' to
git-p4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C
H
ama
n
o
Start draft r
e
l
e
ase
n
ot
e
s for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Dm
i
try Pota
p
ov
update-hook
-
example
:
optionally al
l
ow non-f
a
st-
f
orwar
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-06-26
Alex Riesen
Fi
x
use of "perl
-i"
o
n Windo
w
s
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
M
erge
branch 'sb/reba
s
e'
commit
|
commitdiff
|
tree
2008-06-25
J
unio C Hamano
Merge
b
ranc
h
'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
M
erge bra
n
ch 'lt/confi
g
-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C H
a
mano
Merge branch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ha
m
an
o
Merge b
r
anc
h
'jh/clon
e
-packed-refs'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge b
r
anch 'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
Dmi
t
ry Pot
a
p
o
v
f
ix updat
e
-hook
-
e
x
ample to work wi
t
h p
a
ck
e
d
tag
re
f
ere
n
ces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jeff K
i
n
g
cl
o
ne: creat
e
intermediate d
i
r
ecto
r
ies of
destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C Hamano
Merg
e
branch '
j
c/
m
ai
n
t-combine-diff-pre-
c
o
n
text' int
o
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C Hama
n
o
Merge branch 'lt/
m
aint-gitdir-
r
elative' into m
a
int
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
Mer
g
e b
r
anch 'sb/maint-rebase
'
i
n
to maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-each-r
e
f: implement mi
s
si
n
g tag values
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pit
r
e
verify-p
a
ck: test for
d
etection of index v2
o
bject
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nico
l
as Pi
t
re
verify-p
a
ck: check pack
e
d object C
R
C whe
n
using in
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
move show_pack_info() whe
r
e it b
e
l
o
ngs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
tre
optimize veri
f
y-p
a
ck a bit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
eff
Ki
n
g
clone: create intermediate directories
o
f
destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C
Hamano
Sh
i
p sam
p
le hooks with
.
sample
suffix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
pre-rebase hook upd
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
refactor pack structure
a
llocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Ni
c
olas Pitre
t
es
t
case for
pack resilien
c
e against
corruptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
i
m
plement some resil
i
ence
against pack corruptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Ni
c
olas Pitre
call
i
nit_pack_re
v
index() lazily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Junio C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-24
Jan Kr
ü
ger
gi
t
-
s
vn: make r
e
b
uild respect
rewriteRoot optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Hi
g
gins
W
orkaround for AIX mkstemp
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Mich
e
le Ball
a
b
i
o
t9301-fast-export
.
sh: Remove de
b
ug 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 avoiding unn
e
cessary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Junio C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Bey
e
r
Ex
t
end parse-opt
i
o
ns
test
s
u
ite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han
Beyer
a
p
i-p
a
rse-options
.
txt: Introd
u
c
e
documentation for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Michel
e
Ba
l
labi
o
par
s
e
-optio
n
s
.
c:
fix documentation syntax
o
f
o
ptional
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
tephan
B
eyer
api-bu
i
ltin
.
txt: updat
e
and fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Be
y
er
gi
t
-rebase
.
sh:
Add
c
h
eck
i
f reba
s
e
i
s
in
p
rogress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
teph
a
n Beyer
t34
0
4: stri
c
ter tests for git-rebase--interacti
v
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
api-builtin
.
txt: update an
d
fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-22
Junio
C Hamano
Merg
e
branch
'rs
/
ar
c
hive-igno
r
e'
commit
|
commitdiff
|
tree
2008-06-22
J
u
n
i
o C
Haman
o
Merge bra
n
ch
'lt/
r
acy-e
m
pty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge bran
c
h '
s
n/st
a
tic'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge br
a
n
ch 'jc/maint-combine-diff
-
pre-context'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ha
m
ano
Mer
g
e branch 'lt/main
t
-g
i
tdir-re
l
ative'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge branch 'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ham
a
n
o
Merge bra
n
ch 'pb/fast-export'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C
Haman
o
Merge branc
h
'mo
/
stat
u
s-untracked'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
H
amano
Merge b
r
anch 'kh/u
p
date-ref'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hama
n
o
Merge branch 'jn/w
e
b'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
amano
M
e
rge
b
ranch
'
rg/
g
itw
e
b'
commit
|
commitdiff
|
tree
2008-06-21
Sh
a
wn O
.
Pearce
Cor
r
ec
t
d
ocument
a
tion for git-push --mirror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next