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
t7601: extend the 'merge picks up the best result' test
2008-07-23
M
i
k
los Vajna
t760
1
: extend
t
he 'merge p
i
cks
up the best
r
esult'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Da
n
i
e
l Ba
r
kalow
In perf
o
rce, R
C
S keywords
a
re cas
e
-sensitive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Al
e
x
Ri
e
sen
A
llow pager
o
f
diff c
o
m
m
and be en
a
b
led
/
d
i
sabled
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schindelin
Fix t
w
o leftove
r
s from path_list->string_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
gi
t
am
-
-ski
p
:
clean the i
n
dex whil
e
preser
v
ing local
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pierr
e
H
a
bouzit
git-submodul
e
: move ill place
d
s
h
ift
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Habo
u
zit
builtin-merge: add missing structure initializatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
los Va
j
na
bu
i
l
tin-merge:
g
iv
e
a pr
o
pe
r
error message for in
v
a
lid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Jun
i
o C
H
a
ma
n
o
tes
t
s: do not rely
o
n exter
n
al "pat
c
h"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
N
ikolaj S
c
h
u
m
a
cher
Don't cut off last character of commit description
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivi
e
r Marin
parse-options: fix segmentation
f
ault wh
e
n a re
q
uired
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Phi
l
ipp
e
Br
u
hat
.
.
.
mailinfo: better parse ema
i
l adresses con
t
aing pa
r
e
nthe
s
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Ol
i
vier Marin
git-am: remove dash
f
rom h
e
lp messa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
Re
v
er
t
"make git-status use a pager"
commit
|
commitdiff
|
tree
2008-07-22
Jonathan Nied
e
r
git-diff(1)
:
"--c" -> "--cc" typ
o
f
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schindel
i
n
Rename pa
t
h_list
t
o string_li
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Johannes
S
chindel
i
n
Rename
.
git/r
e
base
t
o
.
git/rebase-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
Hamano
Update
m
y e-mail address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
J
unio
C
H
a
mano
Merge branch 'ap/
t
r
a
ckinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Me
r
g
e
branch 'jc/rere
r
e
-
auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
M
e
r
ge bran
c
h
'
ns/
a
m-abo
r
t
'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C
Ham
a
no
Merg
e
branch 'jc/add-add
r
em
o
v
e'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Ha
m
a
n
o
"
needs update"
c
onsidered harmful
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C H
a
mano
Move r
e
ad_in_full() and write_i
n
_full() t
o
wrapper
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
J
u
n
io
C
Hama
n
o
Link sh
e
l
l
w
ith com
p
at layer
fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
Ham
a
no
Merge branc
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-07-20
Dmitry
Potapov
g
i
t-sv
n
:
f
ix g
i
t svn info
to work wit
h
o
u
t
a
r
gu
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Michel
e
Ballab
i
o
b
u
iltin-push
.
c: Cleanup - use OPT_
B
IT() and remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Michele Ballabio
builtin-merge
.
c
:
Fix opt
i
on parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Jonath
a
n Nieder
fix
usage
s
tr
i
ng for
g
it grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
a
j
na
Teach 'git merge' that some merge strategi
e
s
no
l
on
g
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
L
a
rs Nosc
h
insk
i
c
v
sserv
e
r
:
Add tes
t
suite f
o
r pack
e
d
refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Ha
m
a
n
o
r
efresh
-
i
n
dex:
f
ix bitmask as
s
i
g
n
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hama
n
o
g
it
-
add --
a
ll: doc
u
mentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --all: tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio
C
Ha
m
ano
git-add
--all:
a
dd all files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
bui
l
tin-add
.
c:
r
estructur
e
the
code fo
r
main
t
ainability
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C
H
am
a
n
o
Ge
t
ting closer to 1
.
6
.
0
-
r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Nan
a
ko Shirais
h
i
git am --ab
o
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
A
l
exand
e
r
G
a
vrilov
Support
g
itlinks in fast-im
p
ort
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C
H
a
m
ano
.
ma
i
lmap
u
pdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Baudis
Documentation/git-mer
g
e
.
txt: Partia
l
rewri
t
e of Ho
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Scha
r
fe
arch
i
ve:
remove unuse
d
headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René
S
c
harfe
archi
v
e: make zip co
m
pr
e
ssion level independent from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr
Baudis
Do
c
um
e
ntation
:
How to ignore local
chan
g
es in t
r
acked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Documentation/git-s
u
bmodule
.
txt: Further clari
f
y
th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Peter
H
arris
Add A
N
SI co
n
t
rol
c
o
de emul
a
tion fo
r
t
he W
i
ndows console
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Johanne
s
Sixt
builtin-clone: rew
r
i
t
e guess_dir_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
E
ric Raible
Te
a
ch lookup_pro
g
no
t
to select
directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emmes
testsuite for cv
s
co
-
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschinski
cv
s
s
erver: Add cvs co -c
s
u
p
p
or
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars
Noschinski
cvsserver
:
A
d
d support
f
o
r pack
e
d refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
F
abian
E
mmes
Testsuite
:
U
nse
t
C
V
S_S
E
RVER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
S
tephan
B
eyer
L
ink git-shell only to a su
b
s
e
t
of
l
ib
g
i
t
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
t9001 (s
e
nd-ema
i
l):
D
o not use hardco
d
ed /bin/sh
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
GI
T
1
.
5
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Olivi
e
r Mari
n
b
u
iltin-rm
:
f
ix index
l
ock file p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
J
u
ni
o
C Haman
o
M
erge branch 'sp/
m
aint-index-
p
ack' in
t
o maint
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
http-fetch: do not SEG
V
after fetching a bad pack idx
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
H
amano
r
e
v-li
s
t: honor --quiet
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
b
u
iltin-remote
.
c: fix
ea
r
lier "sk
i
p_prefix
(
)"
conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Stepha
n
Beyer
api-run-
c
omma
n
d
.
txt: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr Ba
u
d
i
s
Documen
t
ation/Re
l
Not
e
s-1
.
6
.
0
.
txt
:
Expand on the incompatible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hama
n
o
r
e
rere
.
a
utou
p
da
t
e: chan
g
e
the messa
g
e when autoup
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hamano
m
a
ilinfo: off-by
-
one fix
for [
P
ATCH (f
o
obar
)
] remo
v
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Haman
o
re
a
d-cache
.
c
: t
y
p
o
fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C
H
amano
Updat
e
d
r
aft
r
elease notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Av
e
ry
Pen
n
a
r
un
Re
w
ord
"yo
u
r branch has
d
iverg
e
d
.
.
.
" lines
t
o
r
educe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
Merge br
a
nch 'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Ha
m
ano
M
erge branch 'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Doc
u
mentation/git-s
u
bmodule
.
t
x
t: Add Description section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
Merge branch 'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ha
m
a
n
o
Merge branch 'rs/ar
c
hive'
commit
|
commitdiff
|
tree
2008-07-17
J
unio
C
H
a
mano
Merge branch 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hamano
M
erge branch 'rs/
r
eb
a
se-checkou
t
-not-
s
o-qui
e
t'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branc
h
'
s
p/maint-in
d
ex-p
a
ck'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Ham
a
no
S
tart p
r
ep
a
ring 1
.
5
.
6
.
4 release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sch
i
ndelin
g
it fetch-
p
a
c
k: do not comp
l
ai
n
a
b
out "n
o
comm
o
n
comm
i
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
ma
n
o
Merg
e
branch '
j
s/main
t
-pretty-m
a
ilmap' in
t
o maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge b
r
anch
'sp/maint-bash-complet
i
on-opt
i
m' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o
C
Hamano
M
e
rge branch 'sp/maint-pac
k
-memuse' into maint
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Hamano
Me
r
g
e br
a
nch 'l
s
/maint-mailinfo-patch-label' into
m
a
int
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
H
amano
Merge branch 'js
/
maint-daemon-syslog' into maint
commit
|
commitdiff
|
tree
2008-07-16
Step
h
an Beyer
rebase-
i
: keep old parents when pre
s
erving merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sixt
t7600-m
e
rge: Use tes
t
_
e
x
pect
_
fai
l
u
re to test o
p
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Potapov
Fix bu
f
fer overflo
w
in
pre
p
are
_
attr_
s
tac
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmit
r
y Potapov
Fix buffer ove
r
flow
i
n
git
diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Potapov
Fix
buffe
r
overflow in
g
it-grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Sung
H
yun Nam
t
/Makefile: use
specified
shell
w
hen running aggregati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Lars Noschinski
git-cvsserv
e
r: f
i
x c
a
ll to nonex
i
stant clean
u
p
W
orkDir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
Sh
i
raishi
parse-options
.
c: make che
c
k_
t
ypos() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
bu
i
ltin-des
c
ribe
.
c: m
a
ke
a global variable "pattern
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
N
anako Shira
i
shi
c
ache-tree
.
c:
m
ak
e
cache_tree
_
fin
d
() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
P
e
t
r
Baudis
Docu
m
entat
i
on/git
-
c
her
r
y-p
i
ck
.
txt et
a
l
.
:
Fix mi
s
lead
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
t/aggreg
a
t
e-re
s
ults: wh
i
t
espace
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Eric Wong
t/lib-git-s
v
n: fix S
V
N_
H
TTPD tes
t
s to w
o
r
k
with
"
trash
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
i
o
C Hamano
Merge
b
r
a
nch 'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hama
n
o
Merge branch
'ag/rew
r
i
t
e_
o
ne'
commit
|
commitdiff
|
tree
next