repo.or.cz
/
git
/
repo.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/g
i
t-m
e
rg
e
.
t
xt: Partial re
w
rite of How
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Sch
a
rfe
archive:
r
emove unu
s
ed headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
R
e
né Scharfe
a
r
c
h
ive: ma
k
e zip compres
s
ion level independent from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pet
r
Baudis
Doc
u
men
t
ation: How to igno
r
e local changes in t
r
acked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pe
t
r
B
a
u
dis
Doc
u
mentati
o
n/g
i
t-sub
m
o
dule
.
tx
t
: Further clarify the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Peter Harris
Add ANS
I
control
c
ode
e
mulation fo
r
th
e
W
i
nd
o
w
s console
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Johannes Sixt
builtin-c
l
one:
r
ewrit
e
g
u
ess_di
r
_
name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Eric
Raible
T
e
ach l
o
okup
_
pr
o
g not t
o
sele
c
t directori
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fa
b
ia
n
E
m
mes
tes
t
suit
e
for cvs
c
o
-c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschinski
cvss
e
rver:
A
dd cvs c
o
-c support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
La
r
s
Noschinski
c
v
sserve
r
:
A
dd s
u
pport for packed refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabi
a
n
Emmes
Testsuite: Unset CV
S
_SER
V
ER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Stephan B
e
y
er
Link g
i
t-sh
e
ll o
n
ly to a subset of libgit
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Hamano
t900
1
(send-email)
:
Do not
use hardcod
e
d /bin/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C
Ha
m
ano
builtin-r
e
mote
.
c
: fix e
a
r
l
ier "skip_prefix(
)
"
conve
r
si
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Pet
r
Baudis
Do
c
ument
a
tion/RelNotes-1
.
6
.
0
.
txt: Expand o
n
t
he
i
ncompatible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
mailinfo: o
f
f
-by-one
f
i
x
fo
r
[PATCH
(
foobar)] removal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
J
unio
C
Hamano
read-cache
.
c: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
U
p
d
ate draft rel
e
ase
n
otes f
o
r 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C
Ham
a
n
o
Merge branch 'mv/
d
a
s
hles
s
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ham
a
no
Merge branch 'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Documentat
i
on/git
-
subm
o
dule
.
txt: Add
D
escription
se
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
H
a
mano
Merge bra
n
ch 'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
Merge b
r
a
nch
'
rs/archive'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge br
a
n
c
h
'
a
g/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Haman
o
Merge branch 'rs/
r
ebas
e
-che
c
k
out-not-so-quiet'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C H
a
mano
Merge
b
ranch
'
s
p/mai
n
t-
i
ndex-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Haman
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
Start preparing 1
.
5
.
6
.
4 relea
s
e notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schinde
l
in
git fetch-pack: do not c
o
mplain
about "
n
o common com
m
its
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
unio C
Ham
a
no
M
e
rge branch 'js/maint-pretty-mailmap' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branc
h
'
s
p/mai
n
t-bash-completion-optim'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C
Hamano
Merge branch 'sp/maint-pa
c
k-
m
emuse' into maint
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
Merge b
r
anch 'l
s
/
m
aint-mailinfo
-
p
atch-l
a
bel' i
n
to maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
b
ranch 'js/maint-
d
aem
o
n
-syslo
g
' into maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Be
y
er
reba
s
e-i
:
keep ol
d
parents when preserv
i
n
g
merge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Jo
h
annes Six
t
t7600-merge
:
U
se test_expect_failure to test op
t
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dm
i
try Po
t
apov
Fix buffer over
f
l
ow
in prepare_attr
_
stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix buffer overflow in git
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix buffer ov
e
r
fl
o
w
in git-gr
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHyun Nam
t/M
a
k
e
file:
use
specified shell when run
n
ing aggre
g
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
L
a
r
s
Nos
c
hinski
git-c
v
s
s
e
r
ver: fix call to none
x
istant cleanupWorkDir
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
N
anako
S
hiraishi
parse-
o
pt
i
ons
.
c: make
check
_
typos() static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nana
k
o
Shiraishi
builtin-descri
b
e
.
c: ma
k
e a global variable "patter
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
N
anako Sh
i
raishi
cache-t
r
ee
.
c:
m
ake cache_tree_fin
d
() st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudis
D
o
cumentation/g
i
t-
c
herry-pick
.
t
xt et al
.
:
Fix misleading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
i
o C Hama
n
o
t/
a
gg
r
egate-re
s
ul
t
s: whitespace
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eric Wo
n
g
t/
l
ib-git-svn:
f
ix SVN_HTTPD tests t
o
work w
i
th "trash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C Hamano
Merge branch
'mv/mer
g
e-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C
Hamano
Merge
b
ranch
'
ag/rew
r
ite_
o
n
e
'
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C
H
amano
Merge bra
n
ch 'sp/
w
i
n'
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
io
C Hama
n
o
Merge branch '
j
s/m
o
re
-
win
'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C
Ha
m
ano
Merge branc
h
'js/maint-p
r
etty-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
J
o
h
annes Schindeli
n
Rename "
.
dotest/" to
"
.
g
it
/
rebase" a
n
d "
.
d
otest-m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilov
Do not
t
r
y
t
o dete
c
t mo
v
e/copy
f
or en
t
r
i
es belo
w
thre
s
hold
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavril
o
v
Avoid rescanning
u
nchanged entries in search for co
p
ies
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Ha
m
ano
U
p
d
at
e
draft release
n
otes to
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Johannes S
c
hindel
i
n
shortl
o
g: support
-
-
pr
e
tty=
f
ormat
:
op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ciar
a
n McC
r
eesh
M
ake
git-add -i
accept ranges like
7
-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Pavel Roskin
t
9600: allow te
s
t
i
ng with cvsps 2
.
2, including
b
eta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
ar
c
hiv
e
: remo
v
e
extr
a
argu
m
e
nts parsin
g
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
a
r
c
hive: unif
y
file
a
t
tribute handlin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharf
e
archi
v
e: centralize arch
i
ve entry writing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Schar
f
e
ar
c
hive: a
d
d baselen
m
ember to struct archiver_args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René
Sc
h
ar
f
e
add context po
i
nter to read_
t
ree_recursiv
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René
Scha
r
fe
archive: remove args
member f
r
om
s
tru
c
t archiver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
in
d
e
x
-pack
:
Hon
o
r c
o
re
.
deltaBaseCacheLimit when resol
v
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n O
.
Pearce
index-pack:
T
ra
c
k the object_entry that cre
a
tes each
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Cha
i
n the
s
truct bas
e
_da
t
a
on the
stack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
i
ndex-pack: Ref
a
ctor
base a
r
guments of
resolve_delta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
Merge g
i
t:/
/
repo
.
o
r
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C Hama
n
o
Merge branch 'js/merge-rr'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Haman
o
Merge bra
n
c
h
'sb/rerer
e
-lib'
commit
|
commitdiff
|
tree
2008-07-15
J
uni
o
C Hama
n
o
Merge bran
c
h
'ls
/
maint-mailinfo-patch-la
b
el'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Me
r
ge bran
c
h 'om/rerere
-
c
areful'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
Merge bran
c
h 'jc/branc
h
-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
Merge bra
n
ch 'jc/rebase
-
o
r
ig-head'
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n O
.
Pea
r
ce
ba
s
h c
o
mpletion: Remove da
s
hed comma
n
d compl
e
tion su
p
port
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
M
erge branch 'sp/main
t
-bash-
c
ompletion-
o
p
t
im'
commit
|
commitdiff
|
tree
2008-07-15
Nico
l
as Pitre
restore lega
c
y behavior for
r
e
ad_sha
1
_
file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Teemu
L
ikonen
bash
:
Add long optio
n
c
ompl
e
tion fo
r
'git send
-
e
mail'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedah
l
git-sub
m
odule - r
e
gi
s
ter
submodule URL if a
d
din
g
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ma
r
k Levedahl
git
-
sub
m
odule - make
"submod
u
le
add"
m
o
r
e s
t
rict,
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
F
reder
i
k Schwarze
r
git-svn:
typofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
João
Abec
a
sis
git-svn: find-rev and rebase
f
or SVN::
M
irr
o
r r
e
positories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
amano
tutorial:
cl
a
r
i
fy "
p
ull"
i
s "fetch + merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
I
a
n Katz
tutorial
:
u
s
e prompt with
use
r
n
a
mes in examp
l
e, to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
S
hawn O
.
Pearce
ba
s
h complet
i
on: R
e
solve git show ref:p
a
t
h<tab>
l
o
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio
C
Hamano
g
i
t-rebase: repor
t
c
he
c
kout failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hamano
r
educe_heads(): protect
f
rom
duplic
a
te i
n
put
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hamano
U
p
date draft release
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Lukas S
a
ndström
git-mai
l
i
nfo: use strbuf's
i
nstea
d
of fixed b
u
ffers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Shaw
n
O
.
Pearce
bash
c
ompletion: Append
s
pace a
f
t
e
r fi
l
e names have
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Luka
s
S
a
ndström
git-ma
i
linfo
:
Fix
getting the sub
j
e
c
t
from the in-body
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hama
n
o
Mer
g
e branc
h
'sp/maint-
b
ash-com
p
letion
-
op
t
im'
commit
|
commitdiff
|
tree
2008-07-13
Shaw
n
O
.
P
e
arce
bash completion: Don
'
t of
f
e
r
"a
.
.
"
a
s a
c
ompletion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Ramsay Jon
e
s
git-
r
eque
s
t-pull: repl
a
ce call to deprecate
d
peek-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beye
r
Ma
k
e
re
b
ase
-
-
int
e
ractive use OPTI
O
N
S
_
S
P
E
C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Step
h
an Be
y
e
r
t3404: te
s
t
two "preserve
m
erges with -p" ca
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Steph
a
n Beyer
git-a
m
/
g
it
-
mailsplit: correct synopsis
f
or reading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next