repo.or.cz
/
git
/
jrn.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
B
audi
s
Documenta
t
ion/git-merge
.
txt
:
P
artial rewrit
e
of H
o
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René
Schar
f
e
archive: remove unused headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archive:
m
a
k
e
zip co
m
p
r
essi
o
n level independent from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Baudis
Documentation: How to ignore
loca
l
chan
g
es in track
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr
Baudis
Docu
m
entat
i
on
/
git-su
b
module
.
txt: Further clarify
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
P
e
ter Ha
r
ris
Add ANSI control code emulation fo
r
the Windo
w
s console
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Joh
a
nnes
S
i
xt
buil
t
in-clone
:
r
e
w
r
ite guess_dir_
n
ame(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Eric Raible
Teac
h
lookup_prog not to select dire
c
tories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emmes
testsuite for cvs
co -c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
L
a
r
s Noschinski
cvsserver: Add cvs co -c support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lar
s
Nos
c
hi
n
ski
cv
s
ser
v
e
r: Add support for packed refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabia
n
Emmes
Testsuite: U
n
set CVS_SERVE
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Steph
a
n
Beyer
Link git-s
h
ell
onl
y
t
o
a subset of libgit
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C
Hamano
t9001 (send-email
)
: Do not use hardc
o
de
d
/bin
/
s
h i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
Hamano
builti
n
-
remote
.
c: fix earlier
"
skip_
p
r
e
fix()" conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Docu
m
entation/RelNote
s
-
1
.
6
.
0
.
txt: Expand on the incompa
t
ible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ham
a
n
o
mailinfo: off-by-one fi
x
fo
r
[PATCH (
f
oobar)]
r
emoval
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
uni
o
C Hamano
r
ead
-
cache
.
c:
t
y
p
ofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ha
m
ano
Update dr
a
ft
r
elea
s
e no
t
e
s
for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
mano
M
erge branch 'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Haman
o
Merge
br
a
nch
'
l
s
/mai
l
info
'
commit
|
commitdiff
|
tree
2008-07-17
Petr
B
audis
Documentation/git-s
u
bmodule
.
t
x
t: Add D
e
scrip
t
i
on sectio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
unio
C Hamano
Merge
branch 'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C H
a
ma
n
o
Merge branc
h
'
rs
/
a
rchive'
commit
|
commitdiff
|
tree
2008-07-17
J
u
n
io C Ham
a
no
Merge branch
'
ag/blame
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
mano
Me
r
g
e branch 'rs/rebase-checkou
t
-
n
ot-
s
o-quie
t
'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Hama
n
o
Merge branch
'
s
p
/mai
n
t-ind
e
x-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hama
n
o
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Star
t
preparing 1
.
5
.
6
.
4 releas
e
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johann
e
s Schindelin
git fetch-
p
ack: do not complain about "no common commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Ha
m
ano
Merge
branch
'
js/maint
-
pretty-mailm
a
p' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C H
a
mano
Merge branch 'sp/maint-bash-completio
n
-optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hama
n
o
Merge branch 'sp/m
a
i
nt-pack-memuse' into maint
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C
H
a
m
ano
M
er
g
e
b
r
anch 'ls/maint-mail
i
nf
o
-patch-labe
l
'
i
nto maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'js/maint-daemon-syslog'
into
maint
commit
|
commitdiff
|
tree
2008-07-16
Ste
p
han Beyer
rebase-i: k
e
ep o
l
d
parents when
p
r
e
s
e
rving me
r
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sixt
t7600-merge: Use test_expect_failure t
o
t
e
st
o
ption
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Potapov
Fix buff
e
r overflow in pr
e
pare_attr_stack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Pota
p
ov
Fix buffer overflow in git diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry
P
otap
o
v
Fix buffe
r
over
f
l
o
w in git-
g
rep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Sung
H
yun N
a
m
t
/
M
a
kefile: u
s
e specified sh
e
l
l wh
e
n ru
n
ning ag
g
rega
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Lars Noschinski
g
i
t
-
cvsserver: fix call to nonexistant cleanu
p
W
orkDir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako
Shiraishi
parse-options
.
c: m
a
ke
c
heck_typo
s
() st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako
S
hiraishi
builtin-d
e
scrib
e
.
c
:
make a
g
lobal var
i
ab
l
e "pat
t
ern
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shirais
h
i
ca
c
he-tree
.
c: make cache_tree_find(
)
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Petr
B
audis
Doc
u
m
entation/git
-
cherry-pick
.
txt et al
.
: Fix misleading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
t/agg
r
egate-results:
whitespace fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Eric W
o
ng
t/lib-git-s
v
n
: fix SV
N
_HT
T
PD te
s
ts
t
o
wor
k
with "trash
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
b
r
a
n
ch
'
mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C
Hamano
Me
r
ge branch 'a
g
/
r
ewrite_one'
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o
C
Hamano
M
erge bra
n
ch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C Hamano
Merge b
r
anc
h
'js/more-win'
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io
C
H
a
mano
M
e
rge branch 'js/maint-pretty-ma
i
lm
a
p'
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schinde
l
i
n
Rename "
.
dotest/" to "
.
git/rebas
e
"
and "
.
d
otest
-
merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
A
l
exander Ga
v
rilov
D
o
n
o
t try to
d
etect mov
e
/co
p
y for entries below threshold
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilov
Avoid rescanning unchanged e
n
tries in se
a
rch for copies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C Hama
n
o
Update dr
a
ft release notes to
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Johannes Schinde
l
in
shortlog: supp
o
rt --pretty=fo
r
ma
t
:
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ciara
n
M
c
Creesh
Make g
i
t-add
-i
accept ranges l
i
ke 7-
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Pa
v
el Roskin
t9600: allow t
e
s
t
ing with cvsps 2
.
2,
i
ncluding
beta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Sch
a
rfe
arch
i
v
e: r
e
move extr
a
argument
s
parsing code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archive:
u
n
i
fy f
i
le attribute handl
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Sc
h
a
rfe
ar
c
h
i
ve: centra
l
i
ze a
r
c
h
ive en
t
ry writin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archive: add base
l
en me
m
ber t
o
s
truct archiver_ar
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Re
n
é Scha
r
fe
a
d
d context
pointer t
o
read
_
tree_rec
u
rsive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
R
e
né
Scharfe
archive:
r
emove args member from struct archiver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
h
a
w
n O
.
Pea
r
c
e
in
d
ex-pac
k
: Honor co
r
e
.
delta
B
aseCacheLimit when resolving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
hawn
O
.
P
e
arce
index-pack
:
Tra
c
k the o
b
ject_entry that create
s
each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-
p
ack:
Chain the struct base_data
o
n
t
he stack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n O
.
P
earce
index-pack: Re
f
act
o
r base argument
s
o
f
resolve_delta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C
H
am
a
no
Merge git
:
/
/
repo
.
or
.
cz
/
gi
t
-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Me
r
ge branch 'js/m
e
rg
e
-rr'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
M
e
rge bra
n
ch '
s
b/rerere-lib'
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C Hamano
Merge branch 'ls
/
maint-mailinf
o
-patch
-
labe
l
'
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C
Hamano
Merg
e
branch 'om/rerere-caref
u
l'
commit
|
commitdiff
|
tree
2008-07-15
J
u
ni
o
C H
a
mano
Merge bran
c
h 'j
c
/branch-merg
e
d
'
commit
|
commitdiff
|
tree
2008-07-15
J
unio
C
Ha
m
ano
Me
r
ge br
a
nch 'jc/rebase-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
S
h
awn O
.
P
e
ar
c
e
bash c
o
mpleti
o
n: Re
m
o
ve dashed command
c
ompletion support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C
H
amano
Merg
e
branch 'sp/mai
n
t-bash-completion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Nicolas Pit
r
e
restore legacy behav
i
or f
o
r read_sha1_
f
ile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Tee
m
u Likonen
bash: Add
lo
n
g option completio
n
for 'gi
t
send-emai
l
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedahl
git-submodule - r
e
gis
t
er
submod
u
le URL if adding in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedahl
git-su
b
modul
e
- ma
k
e "submodule add" more
s
tr
i
c
t
,
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Frederik S
c
hwarzer
g
it-svn: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
J
o
ão Abecas
i
s
git-
s
v
n: find-re
v
and
rebas
e
for
S
V
N
::Mirror repositories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C Ham
a
no
t
utorial: clarify "
p
ull"
i
s "fetch + merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ian Katz
tutorial: use prompt with
u
s
er nam
e
s
in exa
m
ple, to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
bash comp
l
eti
o
n: Re
s
olve git sh
o
w ref:
p
ath<tab>
losing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Ha
m
ano
git
-
r
e
b
ase: report ch
e
ck
o
ut fa
i
l
u
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Junio C
Haman
o
r
educe_hea
d
s(): protect from duplicate inp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Juni
o
C
H
amano
Update
draft relea
s
e notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Lukas S
a
ndst
r
ö
m
git-ma
i
lin
f
o: use str
b
u
f's instead of fixed buff
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Shawn O
.
Pearce
bash co
m
pl
e
tion: Append spac
e
after file names have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
L
uka
s
Sandström
g
i
t
-mai
l
info: Fix g
e
tting the subject
f
rom the
i
n
-body
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merg
e
b
r
anch 'sp/maint-bash-completion-opt
i
m'
commit
|
commitdiff
|
tree
2008-07-13
Sha
w
n
O
.
P
e
a
r
ce
b
a
sh completion
:
D
o
n't of
f
er "a
.
.
" as a completio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ramsay Jones
git-
r
eques
t
-
p
ull: replace call to
deprecate
d
pee
k
-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
Make rebas
e
--interactive use O
P
TIONS_
S
PEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
t
3
404: te
s
t two "preserv
e
merges with -p" case
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
git
-
am/git-ma
i
lsp
l
i
t
: correct sy
n
opsis f
o
r reading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next