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
Build in merge
2008-07-08
Mi
k
l
o
s Vajna
B
uild
in
merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Fix
t
7
601
-
merg
e
-
pull-config
.
sh on AIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tre
e
: ma
k
e it usable from other bu
i
ltins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
o
s
Vajna
A
dd new t
e
st case to ensure git
-
merge prepend
s
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add n
e
w
t
est
c
a
s
e
t
o ensure
g
it-merge
r
educes o
c
topus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Introduc
e
r
educe_heads()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Introdu
c
e
get_merge_bases_man
y
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
Vaj
n
a
Add new t
e
st
t
o ensure git-merge handles m
o
re than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce g
e
t_octopus_merge_b
a
ses
(
) in
commit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it usable fro
m
other bu
i
ltin
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cach
e
_u
n
merge
d
()
t
o
r
e
a
d-cache
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new te
s
t to ensure
git
-
merge handles
p
ull
.
twoh
e
ad
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
M
ove p
a
rs
e
-options's skip
_
pr
e
fix() to
g
it-
c
omp
a
t
-
util
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move
c
om
m
it_l
i
st_cou
n
t() to commi
t
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move split_c
m
dline() to alia
s
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C
H
amano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
Brian
G
ernhardt
Add tes
t
results directory to t/
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
d
o
c/rev-p
a
rse:
c
l
arify reflog vs --until
for spec
i
fying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio
C
H
a
m
a
n
o
U
pdate draf
t
re
l
e
a
se notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder
@
uchicago
.
edu
Documen
t
a
tion: do
n
't assume gi
t
-sh-setup an
d
g
i
t
-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Haman
o
t
97
0
0:
s
kip when
T
e
s
t::More
is
n
o
t
a
vail
a
bl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Jun
i
o C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
git-svn: don't sanitize remote names in config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Oli
v
ier Ma
r
in
show
_
s
t
a
ts(): fi
x
stat
s
width
c
alc
u
lation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Mari
n
Documentation: remove {s
h
o
w
,whatchan
g
e
d}
.
difftree config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pennarun
git-svn: avoid filling up the
d
isk
with temp files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
B
j
örn Ste
i
nbr
i
n
k
git cat-fil
e
:
Fix
m
emo
r
y
leak in bat
c
h mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joey H
e
s
s
fix git config example syn
t
ax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Jo
c
hen V
o
ss
avoid off-by-on
e
error
in
run_u
p
loa
d
_archive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT-
V
ERS
I
ON-GEN:
d
o
n
ot fail
i
f
a 'HEAD' f
i
le exist
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Schindelin
comm
i
t-tree: lift com
p
letely arbitrary lim
i
t of 16
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Dm
i
tr
y
P
o
tapov
shrink
g
it-shell by avoiding redund
a
nt d
e
p
ende
n
cies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Christian Coude
r
help: che
c
k early if w
e
have a
command, i
f
not try
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
i
o
C Hamano
Do
c
ument
t
he double-dash "rev --
p
ath" d
i
s
amb
i
guator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ted Percival
D
o
n'
t
us
e
dash commands (git-foo) in tutorial-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiem
a
n
n
test-lib
.
sh:
s
h
o
w git ini
t
outpu
t
when in verbose mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merge
b
ranch 'maint-1
.
5
.
5
' into m
a
int
commit
|
commitdiff
|
tree
2008-06-27
J
u
nio C Hamano
GIT 1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C Hama
n
o
Merg
e
branch 'maint-1
.
5
.
4' in
t
o
m
aint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C
H
a
m
ano
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: accept "git foo" form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
u
n
io C Hamano
di
f
f --che
c
k: d
o
not discard error status upon see
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jef
f
K
ing
improve f
o
r-
e
ach-
r
e
f
test script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xue
Add 'git-p4
.
a
llow
S
ubmit' to git-
p
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Start draft release not
e
s for
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Dm
i
tr
y
Pota
p
ov
update-ho
o
k-
e
xam
p
le: optionally allow non-
f
ast-forw
a
r
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
i
o
C
H
a
mano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
A
lex Riesen
Fix use
of "p
e
rl
-
i" on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C Hamano
G
IT 1
.
5
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
unio
C Hamano
Merge branc
h
's
b
/r
e
ba
s
e
'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
i
o
C Hamano
Merge branch 'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
a
m
ano
Merg
e
branch 'l
t
/
c
onfig-fsync
'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge bran
c
h 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
ama
n
o
M
e
rge br
a
nch '
j
h/clone-packed-refs'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o
C Hamano
Merge branch 'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Potapov
fix up
d
ate-hook
-
example to wo
r
k with packed
t
ag referen
c
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
King
clone: create
intermedia
t
e direct
o
r
i
es of destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
M
e
rge branch
'
jc/m
a
int-combine-diff-p
r
e-context
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
M
erge bra
n
ch
'
lt/maint-g
i
t
dir-relative' into maint
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C Hamano
Merg
e
branch 'sb/maint-rebase'
i
nto maint
commit
|
commitdiff
|
tree
2008-06-25
J
e
ff King
for-e
a
ch-ref: implement
missing tag val
u
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
i
co
l
a
s Pitre
verify-pac
k
: test for det
e
ction of i
n
d
ex v2 obj
e
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pit
r
e
verify-pack: check
packed o
b
ject CRC when
u
s
ing index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
icolas Pitre
mov
e
sho
w
_
pack_info
(
) where it belongs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicola
s
Pitre
o
p
timize
v
e
r
ify-pack a bit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jeff Ki
n
g
clone: creat
e
intermediate
directorie
s
o
f
destina
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hamano
S
h
ip sample
hooks with
.
sa
m
p
l
e suffix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
pre-reb
a
se hook upd
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
las
P
itre
r
e
facto
r
pack structure allo
c
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
test case for pack re
s
ilience
a
g
ainst corr
u
ptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitr
e
im
p
lem
e
nt some resilience against pack corruptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
call i
n
it_pack_revin
d
e
x
()
l
a
zily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
J
a
n
K
rüger
git-svn: make rebuild respe
c
t re
w
riteRoot
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higgins
W
o
rkaround
f
or AIX mk
s
temp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Mi
c
hele Bal
l
abio
t9301-fast-export
.
s
h
:
R
e
move debug line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Linus Tor
v
alds
S
h
r
in
k
the git
binary a
bit by av
o
idi
n
g unnecessary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Junio C Hamano
M
erge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-23
S
tephan Be
y
e
r
Extend parse-opt
i
ons test su
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
t
eph
a
n Beyer
api-p
a
rse-o
p
tions
.
txt
:
Introduce
documentation
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Mich
e
le Ba
l
labio
p
a
rse-optio
n
s
.
c
:
fix documentation sy
n
tax of opti
o
n
a
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beyer
api-builtin
.
t
x
t: update and fi
x
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
t
ephan
B
eyer
gi
t
-
re
b
ase
.
sh
:
A
d
d check if reb
a
se is in progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han Beyer
t3404: st
r
i
c
ter tests for git-rebas
e
--interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
tephan Beyer
api-bui
l
tin
.
txt: upd
a
te and fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
e
rge
b
ranch 'rs/arc
h
ive-ign
o
r
e
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge
b
ranch 'lt/racy-e
m
pty'
commit
|
commitdiff
|
tree
2008-06-22
J
un
i
o C Hamano
Merge b
r
anch 'sn/st
a
tic'
commit
|
commitdiff
|
tree
2008-06-22
J
uni
o
C Hamano
Merge branch 'jc/m
a
i
n
t-combine-diff-pre-co
n
text'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Ha
m
ano
Merge branc
h
'lt/maint-git
d
ir-rel
a
tive'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch '
j
k
/test'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Haman
o
M
er
g
e branch 'pb/fa
s
t-ex
p
ort'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C H
a
mano
Merge b
r
anch '
m
o/stat
u
s-untr
a
c
ked'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branc
h
'kh/update-
r
ef'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C Hamano
M
e
r
g
e branch 'jn/web'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
erge
branch 'rg/gi
t
web'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
Pea
r
ce
Correct documentat
i
on
for git-push
--mirror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-21
Ja
k
u
b
Narebski
t/README:
Add 'Skipping Tests
'
secti
o
n below 'Running
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-21
C
ris
t
ian Peraferrer
Print er
r
n
o
u
pon fail
u
r
e
to op
e
n
the
C
O
MMIT_EDI
T
MSG
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next