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
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5
2010-01-20
Junio C
H
amano
Me
r
ge
b
ranch 'jm/maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
M
e
rge br
a
nch
'
maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
Merge branch 'm
a
i
n
t-1
.
6
.
3' into main
t
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge branc
h
'maint-1
.
6
.
2' in
t
o maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Hamano
Merge com
m
it
'
v1
.
6
.
4
.
4-8
-
g8de6518' in
t
o
m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Fix
m
is-backp
o
rt of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jim
M
e
y
e
rin
g
g
r
ep: NUL termin
a
te input from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
erge branch 'maint
-
1
.
6
.
1' into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
Merge
b
ranch '
m
aint
-
1
.
6
.
0' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
Andre
a
s Gruenbacher
base85: M
a
ke
the cod
e
more obvious instead of explaini
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andre
a
s Gruenbacher
b
ase85: encode_85() does not us
e
the
d
ecode table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas Gru
e
nbacher
base85 de
b
ug code:
Fix length byte calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
che
c
kou
t
-m: do not t
r
y
t
o fall back to
-
-merge fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu Moy
br
a
nch: d
i
e explicitl
y
why wh
e
n
calli
n
g "g
i
t
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
J
e
f
f K
i
ng
textconv:
s
top leaking
f
ile desc
r
ip
t
or
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Juni
o
C
H
amano
Merge branch
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
Greg Price
commit: --cleanup is a
m
essage optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Andrea
s
Schwab
git
c
ount-objects: handle packs b
i
gger than
4G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Nguyễn
T
hái
N
g
ọc Duy
t
7102: make the test f
a
il if on
e
of its check fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
David
R
eiss
Prevent git blame from
seg
f
a
ult
i
ng on a m
i
ssing a
u
thor
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Björn
G
ustav
s
son
reba
s
e -i: abort clean
l
y
if the editor fail
s
t
o
laun
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Steph
e
n Boy
d
te
c
hn
i
cal
-
d
o
cs: doc
u
m
ent ha
s
h
API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
ap
i
-strbuf
.
txt: f
i
x ty
p
os and document launc
h
_editor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Hamano
worktree: don
'
t segfaul
t
with an abs
o
lu
t
e p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ign
o
r
e unknown color conf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jo
h
an
n
es S
i
xt
h
el
p
.
aut
o
correct
:
d
o
not r
u
n a command if t
h
e command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shira
i
s
h
i
Illustrat
e
"
f
il
t
er" a
t
t
r
ibute
w
ith an e
x
ample
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
unio
C
Hamano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Haman
o
Fix archive
fo
r
mat wi
t
h -- on the c
o
mmand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove
p
ost-upload
-
hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
aman
o
M
erge branch 'mm/maint-merge-ff-
e
rror-m
e
s
sage
-
f
i
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
un
i
o C Hamano
Merge branch '
j
n/maint-pull-reba
s
e-error-message' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merg
e
branch 'jk/maint-add-p-delete-f
i
x' in
t
o main
t
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f
Ki
n
g
add-interactive: fix dele
t
ion of no
n
-empty fi
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C H
a
mano
G
i
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus To
r
valds
F
i
x diff
-
B/--dirsta
t
m
i
scount
i
ng of newly added contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
res
e
t
:
i
mprove wo
r
ktree
safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd
Z
ullinger
D
ocumentation: Avoid use
o
f x
m
lto --str
i
ng
p
a
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René
Scharf
e
archive: clarify description of path
p
ara
m
et
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere:
d
o
n
'
t
segfault on
failure t
o
open
r
r
-
cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Pre
p
are for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'uk/ma
i
nt-shortlog-encoding'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
fc/maint-f
o
rmat-
p
atch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge bran
c
h
'
ap/maint-merg
e
-strategy-list-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
man
o
Merge bra
n
ch 'jc/maint-am-keep' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h
'
rs/work-aro
u
nd-
g
rep
-
opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 'rj/maint-c
y
gwin-count-objects
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merg
e
branch 'mm/
m
aint-hint-failed-merge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ham
a
n
o
Merge branch
'th/maint-r
e
mote-
u
pdate-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hama
n
o
Merge branch 'rj/maint-t9700' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Mer
g
e bra
n
ch 'mo/maint-cr
l
f-doc'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
e
rge bran
c
h 't
h
/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
br
a
n
c
h 'pb/maint-use-custom-pe
r
l' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch '
m
m/config-pathna
m
e-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
H
amano
Merge
branch 'bc/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
b
ranch
'jk/m
a
int-break-rename-reduce-mem
o
ry'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Merge branch '
r
j/
m
aint
-
sim
p
lify
-
cygwin-ma
k
efile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge bran
c
h 'np/maint-sideband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
D
o
cumentat
i
o
n
: xmlto 0
.
0
.
18
d
oes no
t
kn
o
w
--s
t
rin
g
param
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
on C
a
sey
t4201:
u
se ISO8859-1
r
a
ther th
a
n ISO
-
8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pu
l
l
:
clarify advice for
t
he u
n
confi
g
u
r
ed er
r
or case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Unconditionally set man
.
bas
e
.
url
.
for
.
relative
.
l
i
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
D
ocumenta
t
ion/Makefile: allow man
.
base
.
u
r
l
.
f
o
r
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hama
n
o
P
r
e
pare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
merg
e
: do
n
ot add st
a
ndard message
w
hen
m
ess
a
ge is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not m
i
s
identify "git merge foo HEAD"
as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
elp: Do not unneces
s
aril
y
look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Mi
c
h
a
e
l J Gruber
Do
c
umentation: Fix a few
i
.
e
.
/e
.
g
.
m
ix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
David Soria Parra
D
o
cumentation: Do
c
um
e
nt --branch
option in git clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
builti
n
-merge: show use
r
-friendly err
o
r
messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-
r
ecurs
i
ve: make
t
h
e error-me
s
sage g
e
neration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Avery Penn
a
run
bui
l
tin-
m
erg
e
.
c: call e
x
clude_cm
d
s
() cor
r
ectly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C H
a
m
a
no
Remove dead code fr
o
m "git
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe C
o
ntreras
format-patch
:
a
d
d
t
est for p
a
rsing
o
f
"--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
for
m
at-
p
a
t
ch: fix pa
r
sing o
f
"--" on the co
m
man
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
mano
built
i
n-apply
.
c: pay attent
i
on
t
o
-p<n> when determin
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Klei
n
e-König
shor
t
log: respect c
o
mm
i
t encoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pi
t
re
pack-
o
bject
s
: split i
m
pli
c
a
tion
s
of --all-pr
o
gress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
i
nstaw
e
b: resta
r
t server if already
ru
n
ning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
p
r
une-
p
acked: only show progr
e
ss when stderr is a tt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio
C Hamano
Protect scripted Porcel
a
ins from GREP_OPTIONS i
n
sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René S
c
harfe
mergeto
o
l-
-
l
ib: simplify gues
s
_merge_t
o
o
l
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
M
atthi
e
u Moy
user-manual: Document that
"git merge" doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matt
h
i
eu M
o
y
merge-r
e
cursive: poin
t
the user to commit when file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
J
unio C H
a
mano
Docu
m
e
n
ta
t
ion: av
o
id xmlto input error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman G
u
pta
Add
b
r
a
n
ch managem
e
n
t fo
r
releases to gitwor
k
fl
o
ws
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lu
k
as Sandst
r
öm
git a
m
/ma
i
linfo: Don't look at in-body headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
T
i
m He
n
i
g
a
n
git remote: Sepa
r
ate u
s
age st
r
ings
for s
u
bcommand
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
diffcore-re
n
a
m
e
:
re
d
u
c
e memory fo
o
tprint by fr
e
eing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jone
s
git-co
u
nt-objects
:
Fix a disk-
s
pace
u
nder-estimate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Greg Pric
e
Document
a
tion
:
undo
c
u
m
ent gc'd fu
n
ct
i
on graph_rele
a
se()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
t9700-perl-git
.
sh:
Fix a
t
est failure on Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
Ma
t
t
h
ieu Moy
expand_user
_
path: expand ~ to $HOM
E
,
not to
t
h
e actual
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu
M
oy
Expand ~ and ~us
e
r in core
.
excludesfile, co
m
mit
.
tem
p
l
a
te
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Philipp
e
Bru
h
at
.
.
.
Make sure $PERL
_
PA
T
H
i
s
d
e
f
ined when the test suite
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Matthew O
g
ilvie
c
o
re
.
autocrlf
d
ocumentation:
m
e
ntion t
h
e crlf attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next