repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/git-merge.txt: Partial rewrite of How Merge Works
2008-07-19
Petr
Baudis
Documentation/git-merge
.
t
x
t: P
a
rtial rewrite
o
f
How
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
a
r
c
hi
v
e
: remove unused he
a
ders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
R
e
n
é Scha
r
fe
archive:
m
a
k
e zip compression
level independen
t
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
P
e
tr Baudis
D
ocumentatio
n
: How
to i
g
nore local changes in
t
rack
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr
B
audi
s
Docume
n
tation/
g
it-submodul
e
.
txt: Fur
t
her cla
r
i
f
y the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Pe
t
er Harris
Add ANSI co
n
trol code emul
a
tion for the
W
indows console
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Johannes Si
x
t
built
i
n-c
l
on
e
: rewr
i
te guess_dir_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
E
ric Raible
T
each lookup_prog not to se
l
ect dir
e
ctories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabia
n
Emmes
te
s
tsuite f
o
r cvs co
-c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschinski
c
v
sserver:
A
dd cvs co -c
s
upport
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
L
a
rs Nos
c
hi
n
ski
cvsserver: Ad
d
support for p
a
cked r
e
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabia
n
Em
m
es
Testsu
i
te:
U
nset
CVS_SERVER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Stephan
Beyer
Link git-shell only t
o
a subset of lib
g
i
t
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
t9001 (se
n
d-email): Do not use h
a
rdcoded /bi
n
/sh in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C
H
a
mano
built
i
n-remote
.
c: fix
e
a
rlier "skip_
p
ref
i
x()" conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Doc
u
mentation/RelNot
e
s-1
.
6
.
0
.
tx
t
:
Expa
n
d on the
i
ncompatible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
mailinfo: off
-
by-one fix for [PATCH
(
f
o
obar)]
removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ha
m
ano
r
e
ad-ca
c
h
e
.
c
: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Haman
o
Update draft r
e
lease
notes f
o
r
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branch 'mv/d
a
shless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
ama
n
o
Merge branch 'ls/maili
n
fo'
commit
|
commitdiff
|
tree
2008-07-17
Petr
B
au
d
is
Documentation/gi
t
-submodule
.
tx
t
: Add De
s
cription
section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Hamano
Merg
e
branch 'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Ham
a
n
o
Merge branch 'rs/archive'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hama
n
o
M
erg
e
bra
n
ch 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merg
e
branch 'rs/rebase-ch
e
ckout-not
-
so-qu
i
e
t
'
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C
Ham
a
no
Me
r
ge branc
h
'sp/mai
n
t-in
d
ex-pack
'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Ha
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hama
n
o
Start preparing 1
.
5
.
6
.
4 rel
e
a
se
n
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johan
n
es Schindelin
git fetch-pack: do
not complain about "no common co
m
mits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Ha
m
ano
Merge
b
r
anch
'js/main
t
-pr
e
tty-mail
m
ap' in
t
o maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Hamano
Merge branch 'sp/maint-bash-completi
o
n-optim' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C
H
amano
Merge bran
c
h 'sp/maint-pac
k
-m
e
mus
e
' into ma
i
nt
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
M
e
rge branch 'ls/
m
a
i
n
t-mai
l
info
-
patch-lab
e
l
'
i
nt
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Haman
o
Me
r
ge b
r
anch 'js/main
t
-da
e
mon-sy
s
l
og' into maint
commit
|
commitdiff
|
tree
2008-07-16
Step
h
a
n
B
e
ye
r
rebase-
i
: keep old parents
w
hen pre
s
erving merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johann
e
s Sixt
t7600-merge: U
s
e tes
t
_ex
p
ect_failur
e
to
te
s
t option
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Potapov
Fix buffer overflow in pr
e
p
are_attr_
s
tack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmit
r
y Potap
o
v
Fix buffer ove
r
flow in git diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitr
y
Pot
a
pov
F
i
x buffer over
f
low
i
n git-gr
e
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Sun
g
Hyun Nam
t/Ma
k
ef
i
le: us
e
specified sh
e
ll when running
a
g
g
r
e
g
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Lars
N
osc
h
inski
g
i
t-cvsserver
:
fix
c
all to
nonexistant c
l
eanupWorkDir(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shi
r
a
i
s
hi
parse-op
t
ion
s
.
c: make
c
heck_typos() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako S
h
irai
s
hi
builtin-describe
.
c
:
m
a
k
e
a
global variable "patt
e
r
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
Shir
a
ishi
c
ache-tree
.
c: make cache_tre
e
_fin
d
() sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudis
Documentation/git-cherry-p
i
ck
.
txt et al
.
: Fi
x
mis
l
eadin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Haman
o
t/aggreg
a
t
e
-results:
w
hitespace
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Eric Wong
t
/
l
i
b-git-s
v
n:
fix S
V
N
_H
T
TPD tests to work with
"
tr
a
sh
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Me
r
g
e
branch 'm
v
/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C
Hamano
Mer
g
e branch 'ag/rewrite_o
n
e'
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
mano
M
e
rge
b
r
anch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Hamano
Merge branch 'js
/
m
ore-win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
branch 'js/maint-pretty-
m
ailmap'
commit
|
commitdiff
|
tree
2008-07-16
J
ohannes Schin
d
elin
Rename
"
.
dotes
t
/
"
to "
.
g
it
/
r
ebase
"
and "
.
d
otest-merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
A
l
e
xander
Ga
v
rilov
Do not try to detect mo
v
e
/copy fo
r
e
n
tri
e
s be
l
ow threshold
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gav
r
ilov
Avoid rescanning unchange
d
entries in
s
e
arch for cop
i
es
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Upda
t
e draft
r
elease notes to 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Johann
e
s Schindelin
shortl
o
g:
s
upport --pretty=f
o
r
mat:
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran
McCreesh
Make git-add
-
i accep
t
ranges like
7-
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Pave
l
Ro
s
k
i
n
t9600:
a
llow testing with cvsps
2
.
2, i
n
cludi
n
g beta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Re
n
é Sch
a
rfe
arc
h
ive: remove extra arguments parsing code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René
S
charfe
arch
i
ve: u
n
ify file at
t
ribute ha
n
dlin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Schar
f
e
archi
v
e
:
c
entra
l
i
ze archive entry writing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René S
c
harf
e
archiv
e
: add baselen member to s
t
ruct archive
r
_
a
rgs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René
S
charfe
add context pointer to read_tree
_
recur
s
ive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Re
n
é Scharfe
archive
:
r
e
move ar
g
s
m
embe
r
f
r
om struct a
r
chive
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Hono
r
core
.
deltaBaseCacheLimit
w
hen re
s
olving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n O
.
Pearce
index
-
pack: Trac
k
the object_ent
r
y t
h
at creates each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
arce
inde
x
-
p
ack: Chain
t
h
e
struct
b
ase_dat
a
o
n
t
h
e
stack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Refactor base argum
e
nts
o
f resolve_delta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge git://repo
.
or
.
cz/gi
t
-gu
i
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
a
n
o
Merge br
a
nc
h
'js/mer
g
e
-rr'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Hamano
Merge branch
'sb
/
rer
e
r
e-lib'
commit
|
commitdiff
|
tree
2008-07-15
J
uni
o
C H
a
mano
M
erge branc
h
'ls
/
maint-mai
l
inf
o
-pat
c
h-labe
l
'
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Hamano
Merge bra
n
c
h
'om/rerere-careful'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Haman
o
Merge br
a
nch
'
j
c/br
a
n
c
h
-merge
d
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
ano
Merge
br
a
nch 'jc/rebase-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
bash completion:
Remove dashe
d
comman
d
completion
s
upport
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
M
e
r
g
e
branch
'sp/ma
i
nt-bash-com
p
letion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Ni
c
olas Pitre
restore leg
a
c
y
behavior for read_sha1_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
T
e
emu
Likonen
bash: Add long option
c
omple
t
ion for 'git
s
e
n
d
-em
a
il'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark
Levedahl
git-submodu
l
e - reg
i
ster
s
ubmodule URL if adding in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark Lev
e
dah
l
git-submodul
e
-
m
ake "s
u
bmodule add" more
strict
,
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Frederik Schwar
z
er
g
i
t-svn:
t
ypofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
J
oão Abecasis
git-svn: find-rev and reb
a
se for SVN::Mirr
o
r
repositori
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C H
a
mano
tutorial: clarify "p
u
l
l" is "fetc
h
+ merg
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ia
n
K
a
t
z
tuto
r
ial: use prom
p
t with
u
ser
n
ames in
e
x
a
m
p
le, to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
h
awn O
.
Pe
a
rc
e
bash completion: Resolve git show ref:path<tab
>
losing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
J
u
nio C Hamano
git-reba
s
e
:
r
eport chec
k
out
failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hama
n
o
r
e
duc
e
_heads():
protec
t
f
rom dupl
i
ca
t
e
inpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hamano
Update dra
f
t release no
t
es for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Lu
k
as Sandström
git-mailinfo: use
s
trbuf's i
n
stead of fi
x
e
d
b
u
f
f
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Sha
w
n O
.
Pearce
bash com
p
l
e
t
ion: Append spac
e
a
fter file names have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
L
u
kas Sand
s
trö
m
git-ma
i
linfo:
F
i
x
getting the subject from the in-body
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
io C Hamano
M
erge
branch 's
p
/m
a
int-bash-completion-optim'
commit
|
commitdiff
|
tree
2008-07-13
S
h
awn
O
.
Pearce
bash compl
e
tion:
Don't of
f
er "a
.
.
" as a co
m
plet
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ramsay J
o
nes
git-request-p
u
ll: replace call to deprec
a
ted peek-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
Make
reb
a
se--intera
c
tive use OPTION
S
_SP
E
C
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
t3404:
t
est two "preserve
merges wi
t
h -p" cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
git-
a
m/git-m
a
ilspl
i
t:
cor
r
ect synopsis for readi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next