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
checkout --ours/--theirs: allow checking out one side of a conflicting merge
2008-08-31
Junio C Hamano
checkout --
o
urs/--th
e
irs:
allow checking o
u
t one side
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
checkou
t
-f: allow i
g
noring
u
n
m
erged
pat
h
s when checking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
H
amano
checkout: do no
t
check out unm
e
rged higher stages randomly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
P
aolo Ciarr
o
cchi
t
u
toria
l
:
gent
l
er illus
t
ratio
n
o
f Alice/Bob workflow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format
:
r
esp
e
ct date format o
p
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
make git-s
h
ell paranoid ab
o
ut closed
s
t
d
i
n/stdout/st
d
e
r
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Ya
n
n Di
r
son
D
o
c
ume
n
t g
i
tk --argscm
d
flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Linus To
r
val
d
s
Fix '--di
r
stat
'
w
i
th cross-
d
i
r
ectory renaming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björ
n
Steinbrink
for
-
e
a
ch-ref: Allow a trai
l
ing slas
h
in the
p
a
t
te
r
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
ctype
.
c: protect t
i
n
y
C preprocessor constants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linus Tor
v
a
lds
index
-
pack: be
c
a
reful after fixing up the
h
eade
r
/foot
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thá
i
N
gọc
Duy
index-pac
k
:
s
e
tup git
repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
Jones
Suppress some bash redirection error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsa
y
Jones
Fix
a warning (on cyg
w
in) to a
l
low
-W
e
rror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fi
x
"git log -i --
g
rep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C
Hamano
Me
r
g
e branch 'ag/main
t
-com
b
ine-diff-fix
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C
Ham
a
no
Merge branch 'mv/maint-merge-fix'
in
t
o m
a
i
nt
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nie
d
e
r
Doc
u
mentation
:
clarify pager conf
i
g
u
r
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jo
n
athan Nieder
D
ocumentatio
n
: c
l
arify pager
.
<cmd
>
conf
i
guration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Simon Ha
u
smann
Clean up t
h
e
git-p4 do
c
umentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Al
e
x
ande
r
Gav
r
i
lov
Respect
core
.
autocr
l
f in combined dif
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
na
Makefile
:
enabl
e
S
N
P
RINTF_RE
T
U
RNS_B
O
GUS for HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
me
r
g
e
:
f
ix numerus bugs
a
round "trivial merge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
unpack_tree
s
(): protect
the handcrafted in-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Tor Ar
v
id Lun
d
git-p4: F
i
x one-liner in p4
_
write_pipe functi
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
E
r
i
c
Raible
Com
p
letion: add m
i
ss
i
ng '='
f
o
r
'
d
iff
-
-diff
-
fil
t
er'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fi
x
'g
i
t help help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compat/snprint
f
.
c
:
handle snpr
i
ntf's
t
hat always return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wo
n
g
git-svn: fix dcommit to urls
with
embed
d
ed usernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
r
ev
i
s
ion
.
h: make show_early_ou
t
put an exter
n
which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
U
p
d
a
te draft re
l
ease notes for
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan
C
asebolt
Add
h
ints
t
o
r
ever
t
docum
e
ntatio
n
about other
w
ays
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
o
hann
e
s Sixt
I
n
stall
templates
w
i
th t
h
e user and gr
o
up
of
t
he
installing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
"git-merge": al
l
ow fast-forwa
r
ding i
n
a stat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io
C
Hamano
c
o
mpl
e
t
i
on: find
out supported merge strategie
s
correc
t
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
decorat
e
: allow
c
o
ns
t
obj
e
c
ts to b
e
decorated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
for-each-ref
:
cope with tags with incomple
t
e lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C
Hamano
diff --ch
e
ck: do n
o
t
ge
t
confused by new blank lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
remote
.
c: r
e
mov
e
useless
i
f-before-free
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
eff King
m
a
ilinfo: avoid violating
strbuf a
s
sertion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyer
i
ng
gi
t
f
o
rmat-patch: avoid unde
r
r
u
n wh
e
n format
.
h
e
aders
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Brandon Casey
t1002-
r
ead-tre
e
-m
-
u-2way
.
s
h
:
u
se 'gi
t
diff -U0' rathe
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Rob
e
rt Schiele
adapt git-
c
vsserver manpage t
o
d
a
sh-free syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Don Zic
k
us
m
a
il
i
nf
o
:
r
e-fix
MIME multi
p
a
r
t boundary pa
r
sin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
H
a
mano
Start 1
.
6
.
0
.
X maint
e
nanc
e
series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio
C
H
a
mano
GIT
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
M
e
r
g
e git-
g
u
i
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C
Hamano
Merge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Robert Blum
g
it-
p
4:
c
hdir now properly sets PWD
enviro
n
ment variab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ste
p
h
a
n
B
eyer
Improv
e
error outp
u
t of git-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
a
j
na
t9300: replace '!' with te
s
t_m
u
st_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C H
a
mano
Merge git://git
.
kernel
.
o
rg
/
p
u
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
Gi
t
.
pm:
M
ake File::Spec and
File::Temp
r
equireme
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
l
os Va
j
na
Doc
u
men
t
ati
o
n:
d
ocum
e
nt the page
r
.
* config
u
ratio
n
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Stephan Beyer
g
i
t-stash: imp
r
o
ve
s
yno
p
sis i
n
h
e
lp
and
ma
n
ual page
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Eric Blake
Mak
e
file: building git in cygwin 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
S
t
e
ph
a
n
Beyer
g
it-am:
i
gnore --b
i
nar
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Mar
c
us Griep
bas
h
-completi
o
n: Add non-com
m
an
d
g
i
t
h
elp files to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Alex
R
iesen
Fix
t3700
o
n filesyst
e
ms which
d
o
not
su
p
port
q
uestion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumri
a
Utilise
o
ur new p4_read_pi
p
e and p4_write_pipe wrappers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kum
r
ia
Add p4
r
ead_pipe and write_pipe wrappers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
L
e
e
Ma
r
l
o
w
b
a
sh completion
:
A
d
d '--merge
'
long option for 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marl
o
w
bash com
p
letion:
A
d
d
com
p
letion fo
r
'
g
it m
e
r
getoo
l
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Matt McCutchen
git f
o
rmat-patch do
c
ume
n
tation: cla
r
i
f
y what --
c
o
ver
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Eric
R
ai
b
le
bash complet
i
on: 'git app
l
y' should use '
f
ix' not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-14
B
r
a
n
don Casey
t5304-prune:
a
djust
f
ile mtim
e
b
a
sed o
n
system
t
ime
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Bra
n
d
on Casey
tes
t
-parse-
o
ptions: use appropriate
c
ast i
n
leng
t
h
_
callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Kevin Ballard
F
ix escaping
of g
l
ob special characters in paths
p
e
cs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
Rast
rebase -i -p
:
f
i
x paren
t
re
w
riting
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
r
e
base -i -p:
h
andle inde
x
and
workdir correctly
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
Hamano
GIT 1
.
6
.
0-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C
Ham
a
n
o
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-13
Junio
C Hamano
Do not
t
alk about "diff"
in
r
ev-li
s
t docum
e
ntation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
H
a
ma
n
o
Merge git://gi
t
.
bogomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2008-08-13
Thomas Ra
s
t
Doc
u
mentation: rev-l
i
st-opt
i
ons:
R
e
write simpli
f
ication
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf Hende
b
y
Teach git diff ab
o
ut B
i
bT
e
X
h
ead hunk patter
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Gusta
f
Hendeby
g
ita
t
trib
u
t
e
s: Document buil
t
in hunk
h
eade
r
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Stephen R
.
v
a
n de
n
.
.
.
g
i
t-daem
o
n: SysV nee
d
s the
s
ignal
hand
l
er r
e
instated
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Juni
o
C Ha
m
ano
diff --che
c
k:
d
o
not unconditionally complain about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio
C Hamano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Put in the
t
wo
o
ther configuration e
l
ements
f
o
u
nd in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumri
a
Put some docume
n
tation in about the pa
r
am
e
t
ers th
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
An
a
nd Kumria
Move git-p4
.
syncFro
m
Origin in
t
o a confi
g
urat
i
on parameters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Consistent
l
y
use
'gi
t
-p
4
' for the conf
i
gura
t
ion
e
ntrie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Ku
m
ria
If the user
h
as configured vari
o
us p
a
ramete
r
s, use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand
K
umria
Switch to using 'p4_buil
d
_cmd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anan
d
Kumria
If we
a
re in verbo
s
e mode, output what we
are about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
n
a
nd
K
um
r
i
a
Add a sin
g
le command
that will be used to constr
u
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand
Kumria
Util
i
se the
new 'p4_s
y
stem'
funct
i
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Ku
m
ria
H
a
ve a command
that
s
pecific
a
lly invokes
'
p4' (v
i
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Utilise the
new 'p4_rea
d
_pipe_line
s
' command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand
Kum
r
ia
C
reate
a
s
p
e
cif
i
c ve
r
sion
o
f th
e
rea
d
_pipe_lines command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Thomas Rast
D
ocument
a
ti
o
n
: r
e
v-l
i
st-options
:
Fix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Pet
r
Ba
u
d
i
s
Adjust for the new
w
ay of enabli
n
g
th
e
default p
o
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Fr
a
ncis Moreau
git-bisect: f
i
x wr
o
ng usage
o
f
r
ead(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Nguyễn Thái Ngọc Duy
Fix t
y
p
o in comments of longest
_
ancestor_length(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Junio
C
Haman
o
Me
r
ge br
a
n
ch 'maint
'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Re-fix
r
ev-list-options documenta
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next