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 'ag/maint-combine-diff-fix' into maint
2008-08-24
Ju
n
i
o
C
Hamano
Merge bran
c
h
'ag/
m
ain
t
-c
o
mbine-diff-f
i
x'
into mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
Me
r
ge branch 'mv/m
a
i
n
t
-m
e
rg
e
-
f
ix
'
into maint
commit
|
commitdiff
|
tree
2008-08-24
J
onathan Ni
e
der
Docu
m
entat
i
on:
c
larify pa
g
e
r
c
on
f
i
g
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
ha
n
N
i
eder
Document
a
tion: clarify pager
.
<cmd> configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
C
l
ean up
the
g
it-p4 do
c
u
ment
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavri
l
ov
Respect cor
e
.
autocrlf in
c
o
mbined diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable SNPRINTF_RETURNS_BOGUS
f
or HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io
C
Ha
m
an
o
merg
e
: fix numerus bugs arou
n
d
"trivial me
r
ge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpack
_
trees
(
):
p
r
ot
e
ct the handcr
a
fted in
-
core inde
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Ar
v
i
d Lu
n
d
g
it-p4: Fi
x
one-li
n
er in
p
4_wr
i
te_pipe function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric
Raible
Com
p
letion: ad
d
mis
s
ing '=' for 'diff --di
f
f-
f
ilter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mikl
o
s Vajna
Fix 'git he
l
p help
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Brand
o
n Casey
co
m
p
at/snprintf
.
c: handle snprintf's that always r
e
t
u
rn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric
W
ong
git
-
svn:
f
ix dco
m
mit to
urls with e
m
bed
d
ed userna
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Brandon Cas
e
y
revision
.
h: make show_early_output an
ex
t
ern which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Update draft release note
s
for
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Tar
m
i
gan Casebolt
Add hint
s
to
rev
e
rt docum
e
n
tation about ot
h
er wa
y
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johannes Sixt
I
nst
a
ll
te
m
pl
a
tes
with the
u
ser
a
n
d group
o
f the
i
nst
a
lli
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"g
i
t-merge"
:
allow fast-forwardin
g
in a stat
-
di
r
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
co
m
pletion: find ou
t
supported
merge
s
trategies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
ef
f
King
decorate: al
l
ow const obj
e
c
ts to be decor
a
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
ni
o
C Hamano
for
-
each-ref: cope with tags
w
i
t
h incomplete lin
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
di
f
f --check: do not
get confused by new blank
lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
rem
o
t
e
.
c:
remove useless i
f
-before-fr
e
e test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
mailinfo: avoid
v
iolati
n
g
st
r
b
u
f assertion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim
Meye
r
ing
git format-patc
h
: avoid und
e
r
r
u
n
when form
a
t
.
head
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Brand
o
n Case
y
t1002-read-tre
e
-m-u-2way
.
sh: use 'git diff -
U
0
' rathe
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Robert Schiele
adapt git-cvsserver manpage to dash-free syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
D
o
n Zi
c
kus
mailinfo: re-fix MIME multip
a
rt
boundary parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Start 1
.
6
.
0
.
X mainte
n
ance series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Ham
a
no
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
Merge
g
it-g
u
i
0
.
1
1
.
0
commit
|
commitdiff
|
tree
2008-08-17
J
unio C Haman
o
Merg
e
branch 'ak
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Ro
b
ert Blum
g
i
t
-
p4: chdi
r
now properly s
e
ts P
W
D env
i
ro
n
ment v
a
riabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Step
h
a
n
Beyer
Improv
e
e
rror output
o
f git-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mikl
o
s Va
j
na
t9300
:
replace '!
'
with test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C Hama
n
o
Merge git://git
.
kernel
.
org/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
Git
.
pm: Make File::Spe
c
and Fil
e
::Te
m
p requirem
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation:
d
ocu
m
ent
t
he page
r
.
*
confi
g
uration se
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Steph
a
n Beyer
git-stash: improve
s
yn
o
psis in help and manual page
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eric Blake
Makef
i
le:
b
uildi
n
g
git i
n
cygwi
n
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stepha
n
Beyer
git-am:
ign
o
re --b
i
nary option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marcus
G
riep
bash-comple
t
ion: Add non-c
o
mm
a
nd git help files
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
A
lex
R
iesen
Fix t3700 on files
y
stem
s
which do not sup
p
ort question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
A
n
an
d
K
u
mria
Utilise our new p4_read_p
i
p
e
a
n
d
p4_write_pipe
w
rappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Ana
n
d
Kumria
Add
p
4 re
a
d_pipe and w
r
ite_pipe wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Le
e
Marlow
bash completi
o
n: A
d
d '--mer
g
e' l
o
n
g option for 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
b
ash completion: Add completion for 'git mergetool
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Matt McC
u
tchen
gi
t
form
a
t-patch docume
n
tation
:
clarify what --
c
ove
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Er
i
c Raible
bash completion:
'git apply' should use 'fix' no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
t5304-p
r
une:
adjust fil
e
mtime
based on
s
ystem time
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Ca
s
ey
test-parse-options: use
a
p
p
ropriate
c
ast
in len
g
th_callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Kevi
n
Ball
a
rd
Fix escap
i
ng
o
f g
l
ob special
c
ha
r
acters
i
n pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Thomas
R
a
s
t
reb
a
se
-
i -p: fix
p
a
rent r
e
writing
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase -i -p: handle index and work
d
ir co
r
rec
t
ly
commit
|
commitdiff
|
tree
2008-08-13
J
uni
o
C H
a
mano
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merg
e
br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Do not talk
a
bout "diff" in rev-lis
t
do
c
um
e
ntation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio
C Ha
m
an
o
Merge
git://g
i
t
.
bogomips
.
org
/
g
it-svn
commit
|
commitdiff
|
tree
2008-08-13
Th
o
mas Rast
Documentati
o
n:
r
ev-l
i
st-options: Rewrite simplific
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf
H
endeby
Teach
g
it diff about Bi
b
TeX head hunk pat
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
G
ustaf Hend
e
b
y
g
itatt
r
ibute
s
: D
o
cu
m
en
t
built
i
n
hunk
h
eader patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
S
tephen R
.
van den
.
.
.
git-
d
aemon: Sy
s
V
n
eeds the signal handler reinstated
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Jun
i
o C
H
a
m
ano
diff --c
h
eck: d
o
no
t
unc
o
nditionally
c
o
m
plain ab
o
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Put in
t
h
e
t
wo other confi
g
u
ration elemen
t
s fo
u
nd in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Ana
n
d
Kumria
Put some documentation in about
t
he parame
t
e
r
s that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anan
d
Kumri
a
M
ove git-p
4
.
syncFromOrig
i
n
into a confi
g
uration par
a
meters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
An
a
nd Kumria
C
onsistentl
y
use 'git-p4' f
o
r the configu
r
ation entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
If the user
h
as
configured v
a
ri
o
us param
e
ters, use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Ana
n
d Kumr
i
a
Swi
t
c
h
to
u
s
ing 'p4
_
build_c
m
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumr
i
a
I
f we are in verbose mode
,
output what w
e
are ab
o
ut
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
An
a
nd Kum
r
ia
Add a single c
o
mmand that will be us
e
d
t
o construct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Ku
m
ria
Utilise
t
h
e
new
'p4_sy
s
tem
'
function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anan
d
K
u
mria
H
a
ve a
c
om
m
and that specifica
l
l
y
i
nvok
e
s 'p4' (via
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kum
r
i
a
Uti
l
ise the new
'
p4_rea
d
_pip
e
_l
i
nes' command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand K
u
m
r
ia
C
r
eate a specific
v
e
r
sio
n
o
f
the
read_pipe_lin
e
s
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
T
homas Rast
Docum
e
ntati
o
n
:
r
e
v
-
list-o
p
tions: Fix
a
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
P
e
t
r Baudis
Adjust
for the
n
e
w way of enabling the defa
u
lt pos
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Fra
n
c
i
s Moreau
git-bisect: fix wrong usage of read(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Nguy
ễ
n Thái Ngọc
D
uy
Fix
t
ypo i
n
comments of
longest_ancestor_
l
ength()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Juni
o
C Ha
m
a
n
o
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio C Hamano
Re
-
f
i
x rev-li
s
t-options do
c
umenta
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Ivan Stankovic
Documentatio
n
: fix
inv
a
l
id refer
e
nce to 'mybr
a
n
ch'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Fi
x
de
l
eting reflog entrie
s
fr
o
m H
E
A
D
reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Pieter de Bi
e
reflog test: add more tests f
o
r 'ref
l
og delet
e
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Thoma
s
Ras
t
Docume
n
t
a
tion: rev
-
list-option
s
: Fi
x
-g
p
a
ragraph forma
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C H
a
mano
Update draft RelNo
t
es for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hama
n
o
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio C Haman
o
mailinf
o
:
fix MIME
multi-part message bounda
r
y handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
P
ieter de
Bie
builtin-
r
m: A
d
d a --force flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Eric
Wong
gi
t
-svn:
wrap long li
n
e
s
in
a
few places
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Marcus Griep
g
i
t-svn: Allow
de
e
p
b
ranch names by supporting multi
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Marcus Gr
i
e
p
Fix multi-glob assertion in
g
it-s
v
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Thom
a
s Rast
filte
r
-branch: b
e
more
helpfu
l
when an annotated tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
T
h
oma
s
Rast
Docume
n
t
a
tion:
f
ilter-branc
h
: document
h
o
w to filter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
B
randon Casey
M
akefile: add a target
w
hich w
i
ll abort c
o
m
p
ilation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
SZEDER Gábor
bas
h
: remove redundant check
for 'git
s
tas
h
app
l
y
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next