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-16
Ju
n
io C Hamano
Mer
g
e branch 's
p
/win'
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Hamano
Merge
br
a
nch
'
js/more-win'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C Ham
a
no
Merge
bra
n
ch 'js/maint-pret
t
y-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schindelin
R
ename "
.
d
otest/"
to "
.
git/
r
ebase
"
and "
.
dotest-merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilov
D
o
no
t
try
to
detect
move
/
copy for en
t
ries below
thre
s
h
o
ld
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Al
e
xa
n
der Gavrilov
Avoid re
s
canning unchang
e
d e
n
tries in
s
earch fo
r
copies
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Up
d
ate draft re
l
ease notes t
o
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Johannes Schindeli
n
sh
o
r
tlog: support --
p
retty=format: op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
C
i
aran McCre
e
sh
Make
g
it-add -i accept ranges lik
e
7-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Pavel
R
oskin
t960
0
:
allo
w
t
esting with c
v
sps 2
.
2, including
bet
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Schar
f
e
archive: remove
e
xt
r
a
a
rg
u
ments parsing
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archive: u
n
ify file a
t
tribute handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharf
e
archive: centralize ar
c
hive entr
y
writ
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archive: add baselen membe
r
to s
t
ruct arc
h
iver_args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René
S
charfe
add c
o
n
text pointer
t
o read_tree_recursive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René S
c
har
f
e
archiv
e
: remove args me
m
ber f
r
o
m
struct archiver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Honor core
.
deltaBase
C
acheLimit wh
e
n res
o
lv
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shaw
n
O
.
Pearc
e
inde
x
-pack: Tr
a
ck the object_entry
that
c
r
eates
e
ach
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pea
r
ce
index
-
pack: Chain th
e
struc
t
b
a
se_data on the stack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
in
d
ex-
p
ack: Refactor bas
e
arguments of
r
esol
v
e
_
delta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C
Hamano
M
erge git:/
/
r
e
p
o
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ham
a
no
M
e
r
ge branc
h
'js/me
r
g
e-rr'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ham
a
n
o
Me
r
ge br
a
nc
h
'sb/rerere-lib'
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Hamano
M
erge branc
h
'ls/maint-mailinf
o
-patch-label'
commit
|
commitdiff
|
tree
2008-07-15
Junio C
H
aman
o
Merge branch '
o
m/rerere-car
e
ful'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
a
man
o
Merge bra
n
ch 'jc/branch-mer
g
ed'
commit
|
commitdiff
|
tree
2008-07-15
Junio C
H
amano
Merge branch
'jc/rebase-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
Shawn
O
.
P
e
a
r
ce
bash completion:
Remove d
a
shed command completion
s
upport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C
Hamano
Merge branch 'sp/maint-bash-completion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Nicolas
Pitre
r
e
store legacy
b
eh
a
vio
r
for read_s
h
a
1
_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Teemu
Likonen
ba
s
h:
A
dd l
o
ng
o
p
t
ion co
m
plet
i
on for 'git
send-ema
i
l'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark
Lev
e
da
h
l
git-s
u
b
m
odule - register submodule URL
i
f adding in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark Leved
a
h
l
gi
t
-submod
u
le
- make
"
submodule a
d
d" more
strict, a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Fr
e
der
i
k S
c
hwarze
r
git
-
svn
:
typ
o
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Joã
o
Abec
a
sis
git-svn: f
i
n
d
-rev and rebase for S
V
N::Mirror repo
s
itor
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C Hamano
tutorial: clari
f
y "pu
l
l" is "fetch + merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ian K
a
tz
tutorial: us
e
prompt wit
h
u
s
e
r na
m
es
in example, to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pe
a
rce
b
ash complet
i
o
n:
Resolve git show ref:pa
t
h<t
a
b> losing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio
C
Hamano
git-rebas
e
: report che
c
kout failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Ju
n
io C Hamano
reduce_heads(): protect f
r
om dup
l
icate input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Ju
n
io C Hamano
Update draft relea
s
e
n
o
tes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Lukas
San
d
s
trö
m
git-mailinfo: use strbuf's in
s
te
a
d of
fixed buffe
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Shaw
n
O
.
Pearce
bash c
o
mpletion: Appen
d
s
p
a
c
e after file nam
e
s
ha
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Luka
s
Sand
s
tröm
git-mailinfo: Fix getting the subject from the in-bod
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Ha
m
ano
Merge b
r
anch 'sp
/
maint-bash-complet
i
o
n
-o
p
ti
m
'
commit
|
commitdiff
|
tree
2008-07-13
S
hawn O
.
Pearce
bash complet
i
on: D
o
n't offer
"a
.
.
"
a
s a completion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Ra
m
s
a
y Jones
g
i
t-request-pull:
r
eplace
ca
l
l to deprecat
e
d peek-r
e
mote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
Make rebase--interactive use OPTIO
N
S_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
St
e
phan Beyer
t340
4
: test
t
wo "pre
s
er
v
e merg
e
s with -p" cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
S
t
ephan
B
eyer
g
it-am/git-mailsplit: correct s
y
nopsis f
o
r
re
a
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C H
a
mano
Merg
e
branch 'm
a
int' to
s
ync with 1
.
5
.
6
.
3
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
GIT
1
.
5
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge branch
'ph
/
parseopt-step-
b
lame'
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
io C Hama
n
o
Mer
g
e branch 'am/stash-branc
h
'
commit
|
commitdiff
|
tree
2008-07-13
J
unio C Hamano
Merge b
r
a
nch
'
sg/
s
tash-k-i'
commit
|
commitdiff
|
tree
2008-07-13
Junio C
H
amano
Me
r
ge branch 'jc/re
p
o
rt-track
i
ng'
commit
|
commitdiff
|
tree
2008-07-13
Junio
C
H
amano
Merge bra
n
ch 'js/pick-
r
oo
t
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C
H
amano
Merge br
a
n
c
h '
a
b/b
u
ndle'
commit
|
commitdiff
|
tree
2008-07-13
J
unio C Hamano
Me
r
ge bran
c
h
'tr/
a
d
d-i-e'
commit
|
commitdiff
|
tree
2008-07-13
Steffen Pr
o
haska
help
(Windows): Display HT
M
L
in defau
l
t browser using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stef
f
en
Prohaska
help
.
c
: Add su
p
port
for ht
m
l
dir re
l
at
i
v
e
t
o
git_exec_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Steffen Pr
o
haska
M
ove
c
ode interpretin
g
path
r
e
lative
to ex
e
c-dir to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
S
tephan Beyer
Make usage strings dash-
l
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Lukas Sandström
Add some us
e
ful funct
i
ons f
o
r s
t
r
buf manipulation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Lu
k
as Sands
t
röm
Ma
k
e some strb
u
f_*() struc
t
s
t
r
bu
f
arguments const
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Sverre Hv
a
mmen Johansen
reduce
_
heads(): thinkofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos
V
ajna
A
d
d a new t
e
s
t
fo
r
g
i
t-
m
erge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
j
n
a
t6021: add
a ne
w
test for g
i
t-mer
g
e-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Ale
x
ander
N
.
Gavrilov
Fix quadratic performance in rewrite
_
one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Bey
e
r
t
/
: U
s
e "test_must_fail
g
i
t" instead
o
f "! git
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan B
e
yer
t/t
e
st-lib
.
s
h: exi
t
w
ith small negagive int
i
s ok
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
S
t
ephan Beyer
git-am: Do not e
x
it silent
l
y
if co
m
mitter
is un
s
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Sha
w
n O
.
Pe
a
r
ce
bash complet
i
o
n
: Im
p
rove responsiveness of git-log
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
J
ohannes Schi
n
delin
Move
M
E
RG
E
_RR from
.
git/rr-cache/ into
.
git/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Jun
i
o C Hamano
t0004: fix ti
m
ing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
J
ohannes Schinde
l
in
Add pretty format %aN which gives the a
u
thor nam
e
,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
M
ike Pa
p
e
W
e need to c
h
eck for
m
s
ys as well as Windows i
n
add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Johannes Sc
h
indelin
Co
n
vert C
R
/LF to LF in tag
sig
n
atu
r
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Dmit
r
y Kakuri
n
Fixed text file auto-det
e
ction:
t
r
eat
E
O
F char
a
cter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
ma
k
e remove-dashes: apply to scripts and p
r
ogr
a
ms
as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bisect: use dash
-
less form o
n
git bis
e
ct l
o
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s V
a
jna
t1007
-
ha
s
h-obje
c
t
.
s
h
: use quotes for the te
s
t des
c
ription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t0001-init
.
sh: ch
a
nge
confusi
n
g
d
irecto
r
y
n
ame
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Lukas
Sands
t
röm
git-maili
n
fo: document t
h
e -n
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Petr Baudis
Fix backwards-incompatible h
a
ndling of
c
ore
.
sharedRepository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
J
u
nio C Hamano
Teach
merge
.
log to "git-merge" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Stephan Beyer
rerere: Separate
l
ibgit and builtin
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Olivier Marin
bu
i
ltin-rerere:
m
ore care
f
ully
fin
d
conflict
m
arker
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Hamano
appl
y
: fix copy/rename breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
J
unio C Hamano
Merge bra
n
ch 'jk/pager-config'
commit
|
commitdiff
|
tree
2008-07-09
J
u
nio C
Ham
a
no
Merge branch 'js/
a
pply-ro
o
t'
commit
|
commitdiff
|
tree
2008-07-09
J
u
nio C
H
amano
Merge
branch 'j
c
/reflog-expire'
commit
|
commitdiff
|
tree
2008-07-09
R
o
bert Shearman
git-send-email: F
i
x authenticating
o
n
some
server
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Pierre Habou
z
it
revisi
o
ns: refa
c
tor
handle_revisio
n
_
o
pt into parse_revi
s
ion_opt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Pie
r
re Habouzit
g
i
t-short
l
og:
m
ig
r
ate to parse-options partia
l
ly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Pierre Habouzit
git-blame: fix lapsus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Jo
h
annes
S
ixt
P
rovide fal
l
back
definit
i
o
n
s of
PRIu32
a
nd PRIx32
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Ramsay
J
one
s
t9100-git-sv
n
-b
a
si
c
.
s
h:
Fix
d
etermina
t
ion of utf-8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Ramsay Jones
t9113-*
.
sh: provide user fe
e
dbac
k
w
hen test skipped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Junio C
H
a
m
an
o
Merge branc
h
'sp/mai
n
t-pack-memuse'
commit
|
commitdiff
|
tree
next