repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdiff-merge: optionally show conflicts in "diff3 -m" style
2008-08-31
Junio C Ha
m
ano
xdiff-merge: opt
i
o
nal
l
y sh
o
w confli
c
t
s
i
n
"
diff3 -
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C
Hamano
xdl
_
fill_m
e
rge_bu
f
fer
(
): sepa
r
ate
out a
t
oo deeply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Pa
o
lo Ciarrocchi
tu
t
o
r
i
a
l: gentler illustration o
f
Alice/Bob workflow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format: respec
t
dat
e
format options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
make git-shell
paranoid abou
t
closed stdi
n
/st
d
out/stderr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Yann
Dirson
Document gitk --argscmd flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix '--
d
irstat' with
c
ros
s
-direct
o
ry renaming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
for-
e
ach-ref: Allow a tra
i
ling slash in the patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
c
type
.
c
:
protect ti
n
y C pr
e
proces
s
or
constant
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linu
s
T
orv
a
lds
index-pack: be careful af
t
er fix
i
ng up the heade
r
/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễ
n
Thái
Ngọ
c
Duy
index-pack
:
setup g
i
t re
p
ository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Suppress som
e
bash
r
edir
e
ction error mess
a
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
F
i
x a warning (on cygwi
n
)
to allow -W
e
rror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-25
Jeff K
i
n
g
Fix
"
g
i
t log -i --grep"
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
Junio C
H
a
m
a
no
Mer
g
e
branch 'a
g
/maint-co
m
bine-diff
-
fix' into
m
aint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
Merge b
r
anch 'mv
/
maint
-
merge-f
i
x' into maint
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Documentation:
c
larify
page
r
configu
r
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
han
N
ie
d
er
Documentation: clarify page
r
.
<
c
md> configur
a
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Simon H
a
u
smann
Clean up the g
i
t-
p
4 docume
n
t
a
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Ale
x
ander Gavrilov
Re
s
pect core
.
auto
c
rlf in
c
o
m
b
i
ned diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vaj
n
a
M
akefile: enable SNPRINTF_RETURNS_BOGUS
f
o
r HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
merge: fix n
u
mer
u
s bugs around "trivi
a
l
me
r
ge
"
area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
un
p
ack_trees(): prote
c
t the ha
n
d
c
ra
f
ted i
n
-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lund
git-p4: Fi
x
one-liner in p4
_
write_pipe f
u
n
c
tion
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric Rai
b
le
Completion:
a
dd mi
s
sing '=' for
'diff --
d
iff-filte
r
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix 'git help help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
B
r
and
o
n
C
asey
compat/snprin
t
f
.
c: ha
n
dle
snpri
n
tf's that al
w
ays retu
r
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c W
o
ng
git-svn: fi
x
dcommit to urls wi
t
h
embe
d
ded
u
s
ernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Bran
d
o
n
Casey
revision
.
h
: make show_ear
l
y_output an extern whi
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Ham
a
no
Update draft release notes
f
or 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Tar
m
i
g
a
n
Casebolt
Add hints to re
v
ert documentati
o
n
a
bout
other
wa
y
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Johannes
S
i
xt
Install templates with the user and group of the inst
a
lling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"git-merge": allow
fast
-
forwardi
n
g in a sta
t
-
d
irty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
H
a
mano
com
p
le
t
ion: fi
n
d out supported
m
er
g
e strate
g
i
es cor
r
ec
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
decorate:
a
l
lo
w
const
o
bjects t
o
be decora
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
f
or-each-ref:
c
ope with tags with inc
o
mplete lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
d
i
ff --ch
e
ck:
d
o not get confused by new bla
n
k lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meye
r
ing
remote
.
c
: rem
o
ve u
s
el
e
ss if
-
b
efore-free test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
eff King
mailinfo: avoid violating strbuf assertion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
i
m Meyering
git format-patch: avoid un
d
errun when
f
o
rmat
.
headers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
B
randon Casey
t1
0
0
2-read-
t
ree-
m
-
u-2way
.
s
h:
u
s
e 'git diff -U0' rather
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Robe
r
t S
c
hie
l
e
adapt g
i
t-cvsserver manpag
e
to
d
ash-f
r
ee synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Don Zickus
mailinfo:
re-fix MIME mul
t
ipar
t
b
ound
a
ry p
a
rsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Haman
o
S
t
art 1
.
6
.
0
.
X ma
i
ntenance series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GIT
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Hamano
Merge git-gu
i
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
M
erge branc
h
'a
k
/p
4
'
commit
|
commitdiff
|
tree
2008-08-17
Robert Blum
git-p4: c
h
dir n
o
w prope
r
ly sets PWD environment variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Step
h
a
n
Beyer
I
m
prove er
r
or
output
o
f
g
it-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t
9300:
replace
'
!' with t
e
st
_
must_
f
ail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge
git://git
.
kern
e
l
.
org
/
pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-08-16
M
a
rcus Gri
e
p
Git
.
pm: M
a
ke File::Spec and File
:
:Temp requirement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s
Vaj
n
a
D
ocumenta
t
ion: docume
n
t the pag
e
r
.
* con
f
iguration
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Stephan Beye
r
git-stash: improve synopsis in h
e
l
p
a
n
d
manual page
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Eric Bl
a
ke
Makefile: b
u
ilding git in c
y
gwin
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
S
tephan Beyer
git-a
m
: ignore --
b
inary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Marcu
s
Gr
i
e
p
ba
s
h
-
completion: Ad
d
non
-
c
ommand
git help files to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Alex R
i
e
s
en
Fix t3700
o
n filesystems which do
n
ot suppor
t
questio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
Util
i
se
our new p
4
_read_pipe and p4_write_pipe wra
p
p
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
Add p4 read_
p
i
p
e
and
w
rite
_
pipe
w
r
appers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Lee Ma
r
low
bash completion: Add '--me
r
ge' long option for
'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
L
ee Marl
o
w
bash c
o
mpletion: Add
completion for 'gi
t
mergetool'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Matt McCutc
h
en
g
it
format-patch d
o
cumentation:
c
lar
i
fy what --
c
o
v
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Eric R
a
ib
l
e
bash comple
t
ion: 'git apply' sho
u
l
d
use 'fix
'
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Ju
n
io
C
Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-14
Bran
d
on Casey
t5304-prun
e
:
a
d
j
ust file
m
ti
m
e
based on system
t
i
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brando
n
Casey
test
-
parse-options: u
s
e appropr
i
a
t
e cast in length
_
callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Kevin Ba
l
lard
Fix escapin
g
of glob special c
h
aracters in pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Th
o
mas Rast
rebase -i -p: fix
p
arent rewriting
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase
-i -p: handle index and wo
r
kdir
c
o
r
rectly
commit
|
commitdiff
|
tree
2008-08-13
Junio
C H
a
mano
G
I
T 1
.
6
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Hamano
Merg
e
b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
i
o C Hamano
Do n
o
t tal
k
ab
o
ut "diff" in r
e
v-list do
c
umentation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ham
a
no
Merge git://gi
t
.
bo
g
omi
p
s
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
Documentation: rev-list
-
options: Rewrite simplific
a
tio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf Hen
d
eby
T
e
ach git diff ab
o
ut B
i
bTeX
h
ead hunk patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf H
e
ndeby
gitattributes: D
o
cume
n
t
built in hunk header pattern
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Stephen
R
.
van d
e
n
.
.
.
git-daemon: S
y
sV nee
d
s the s
i
gnal ha
n
dler
r
einst
a
ted
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio
C
Hamano
dif
f
--check: do n
o
t unconditionally complain about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Pu
t
i
n the two other
c
onfigur
a
t
ion elements fou
n
d in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Ana
n
d Kumria
P
u
t
some
do
c
umentation i
n
ab
o
u
t
the parameters that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Move
g
it
-
p4
.
syncFromOrigi
n
into a
c
onfigurati
o
n p
a
r
a
meters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
n
a
n
d
Kumria
Co
n
sistently use 'git
-
p4'
for the configuration entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kum
r
ia
If the u
s
er
has
conf
i
gu
r
ed v
a
rious pa
r
ame
t
ers, use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anan
d
Kumria
Swi
t
c
h
to using 'p4_buil
d
_cmd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anan
d
Kumri
a
If
w
e are in
ve
r
b
o
se mode,
ou
t
put what we are about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Ku
m
ria
Add a single
c
ommand t
h
at
will be us
e
d to c
o
nstruct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
An
a
nd Ku
m
ria
U
t
ili
s
e the new 'p4
_
system' function
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Have a
com
m
and that speci
f
ica
l
ly invok
e
s '
p
4
' (via
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Utilise the
n
e
w 'p4_read_pip
e
_l
i
nes
'
c
o
mmand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Create a sp
e
c
i
fic version of
the read_pipe_lin
e
s command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
T
h
omas Rast
D
o
cumentation: rev-list-
o
ptions: Fix a ty
p
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Pe
t
r Baudis
A
djust
f
or the new w
a
y of enabling
t
he default
p
ost
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Francis Moreau
git
-
bisec
t
:
f
i
x
w
r
ong 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 Duy
Fix t
y
p
o
in comments of l
o
nges
t
_ancestor_lengt
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Jun
i
o C Ham
a
n
o
R
e-
f
ix rev-l
i
st-
o
ptions do
c
umentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Ju
n
i
o C H
a
m
ano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
next