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
Ju
n
io C Ham
a
n
o
xd
i
f
f
-merge: optionally show conflicts in "di
f
f3 -
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xdl_f
i
ll_merg
e
_buff
e
r(): separ
a
t
e o
u
t a too d
e
eply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarrocch
i
tuto
r
ial:
g
ent
l
er
i
l
l
ustration of Alice/B
o
b workflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff K
i
ng
pr
e
tty=forma
t
: respec
t
date format optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
aol
o
Bonzini
ma
k
e git-shel
l
paranoi
d
a
b
out close
d
s
tdin/stdout/
s
tderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Doc
u
ment gitk --argscmd flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus T
o
rvalds
Fix '--dirstat' with cro
s
s-di
r
e
ctory renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn St
e
i
nbrink
for-e
a
ch-
r
ef: A
l
l
o
w
a
t
railing slash in the pa
t
t
e
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
ctype
.
c: p
r
otec
t
tiny C preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Li
n
us Torval
d
s
index-pack: be careful af
t
er f
i
xing
up
t
he header/f
o
o
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
N
g
uy
ễ
n
T
há
i
Ngọc
D
uy
ind
e
x-pack: setu
p
git rep
o
sitory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Rams
a
y Jones
Suppr
e
ss some
b
ash
redire
c
tio
n
e
r
r
or
m
e
s
sa
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jone
s
Fix a w
a
rnin
g
(
o
n c
y
gwin) to al
l
ow -Wer
r
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git 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
Juni
o
C
Ha
m
a
no
Mer
g
e branch '
a
g/maint-com
b
ine-
d
i
f
f-fix
'
into
maint
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Ha
m
ano
Mer
g
e
b
r
a
nch 'm
v
/maint-merge-fi
x
' into maint
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nied
e
r
Docume
n
tation: clarify pager
c
onf
i
g
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonath
a
n Ni
e
de
r
Documentation: clarify pager
.
<cmd> configurat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simo
n
Hausmann
C
l
ean up the git-p4 documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexa
n
der Gav
r
ilov
Respect core
.
autocrlf in combined diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile:
e
nable
SNPRINTF_R
E
TURNS
_
BOGUS
f
or HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: fix numerus bug
s
arou
n
d "tri
v
ial
m
erge"
a
re
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
unpack_trees(): protect the handcraft
e
d in-core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Ar
v
i
d Lund
git-p4: Fix one-liner
in p4_write_pipe fun
c
t
i
on
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Rai
b
le
C
o
mpletion: ad
d
m
iss
i
ng
'
=' for 'di
f
f --
d
iff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vaj
n
a
Fix
'
git help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compa
t
/snprint
f
.
c: h
a
ndle snp
r
i
ntf's that
a
lways return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric
W
ong
git-svn: fi
x
dcommit t
o
urls w
i
th embedded u
s
ernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Brando
n
Cas
e
y
revision
.
h: mak
e
show_early_o
u
t
p
u
t
a
n extern whic
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
i
o
C Ham
a
n
o
U
pdat
e
draft rel
e
ase no
t
es for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Tar
m
igan Casebolt
Add hin
t
s to re
v
ert documentation ab
o
u
t
o
ther w
a
ys
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johannes Sixt
I
n
sta
l
l templates with t
h
e user
and group
of the installing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
"git-merge
"
: allo
w
fast
-
for
w
a
rding in a
stat-
d
irty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hama
n
o
com
p
letio
n
: find out
s
upported merge
strategies corr
e
ct
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff Kin
g
dec
o
rate: allo
w
con
s
t ob
j
ects to be d
e
c
orate
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
for-each
-
ref: cope with
t
ags
w
ith
i
n
c
omplete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
dif
f
-
-
c
h
e
ck: do not g
e
t confused by
n
ew blank line
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
re
m
ote
.
c: remo
v
e useless if-befor
e
-free
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff K
i
n
g
mai
l
info: avoid violat
i
ng strbu
f
assertion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
im Meyering
git f
o
rmat-p
a
tch: avoid
u
nderrun
wh
e
n
format
.
head
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Brandon C
a
s
e
y
t1002-read-tree-m-u
-
2way
.
s
h
: use 'git diff
-U0' ra
t
h
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Robert
S
ch
i
ele
adapt git-
c
vsserver ma
n
page
to d
a
sh-free syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
D
on Zi
c
k
us
mail
i
nfo: r
e
-f
i
x MI
M
E multipart bo
u
ndary parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C Hamano
Start 1
.
6
.
0
.
X maintena
n
ce 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-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Hamano
Me
r
ge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Robe
r
t
Bl
u
m
g
it-p4: chdir now properly
s
e
t
s
PWD env
i
ronment var
i
able
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Improve error output of git-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
Vajna
t9300: replac
e
'!' with
t
e
st_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
Mer
g
e
gi
t
:/
/
git
.
kernel
.
org/pub/sc
m
/gitk/gi
t
k
commit
|
commitdiff
|
tree
2008-08-16
M
a
r
c
u
s Griep
Git
.
pm: M
a
ke
F
ile::Spec and File::Temp
r
eq
u
ire
m
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos Vaj
n
a
Doc
u
mentat
i
on: doc
u
ment
t
he pa
g
er
.
* confi
g
uration setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stephan Beyer
git-stash:
im
p
rove sy
n
opsis in help and ma
n
ual p
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Er
i
c Blake
Ma
k
e
f
ile: b
u
i
lding git in
c
ygwin 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stephan Beyer
git-am:
i
gnore --
b
i
n
a
r
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Ma
r
c
u
s Griep
bash-completion:
Add non-command git help files t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Alex Riesen
Fix t3700 on
filesyste
m
s w
h
ich do not
s
upport question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
An
a
nd
K
umria
Utilise our new p4_read_p
i
pe and p4_write_pipe wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
Ad
d
p4 read_pipe and write_
p
ipe
w
rappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
L
e
e Marlo
w
b
a
sh c
o
m
pletion: Add '--merg
e
' long option f
o
r 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
b
ash compl
e
tion
:
Add
c
omple
t
ion for 'git mergetool
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Matt McCutc
h
en
git format-patc
h
doc
u
me
n
tation: clarify what
-
-cover
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Eri
c
Raible
bash
c
omp
l
etion: 'git a
p
ply' should use 'fix'
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
t53
0
4
-pr
u
ne: adjust file mtime based on sys
t
e
m
time
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
test-parse-options: use appropriate
cast in length_callb
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Ke
v
i
n
B
a
lla
r
d
Fix escaping
of glob special cha
r
ac
t
ers in pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Tho
m
as
R
ast
rebase -i -p:
fix par
e
nt
r
e
writing
commit
|
commitdiff
|
tree
2008-08-13
Thomas
R
ast
reb
a
se -i
-
p: han
d
le
i
n
d
e
x
and workdi
r
correctly
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
io C Hamano
GI
T
1
.
6
.
0
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
M
erge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Do no
t
talk abou
t
"diff
"
in rev
-
list documentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merg
e
git://
g
it
.
bogomips
.
org/gi
t
-
sv
n
commit
|
commitdiff
|
tree
2008-08-13
Tho
m
a
s Rast
Documentation: rev-list-opt
i
ons: Rewrite simplification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
G
u
s
t
af Hendeby
Te
a
ch
g
it diff about
B
ibTeX h
e
ad hunk patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
G
u
s
t
af Hendeby
gitatt
r
ibutes:
D
o
cument built in
h
unk header pat
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Stephen R
.
van den
.
.
.
git-daemon: SysV n
e
eds the
sig
n
al
h
andler reinstated
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Ha
m
ano
diff -
-
check: do not uncondi
t
ionally
c
omplain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Juni
o
C
Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Put
in
the t
w
o oth
e
r c
o
n
f
ig
u
ration elements
found in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kumria
Put s
o
me d
o
cumenta
t
ion i
n
about the parameters that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand K
u
mria
Move git-p
4
.
s
y
ncFromOr
i
gin into a
c
onf
i
g
u
r
a
tion parame
t
ers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Consistently us
e
'git
-
p4' for
the configuration entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand K
u
mria
If the user has configu
r
e
d
various parameters, us
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kum
r
ia
Sw
i
tch to using 'p4_build_cmd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
If we a
r
e in
v
erbose mod
e
, output what
w
e a
r
e ab
o
ut
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Add a single com
m
and t
h
at will
be used to construct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand
K
umria
Utilise the new 'p4_system
'
function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
A
na
n
d Kumria
Have a command that sp
e
cifically invokes 'p4' (via
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Utilise the new
'
p
4
_read_pipe_lines' command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Create a specific version of the rea
d
_
p
ipe_line
s
comm
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
T
h
omas R
a
st
Doc
u
mentation: rev-l
i
st-optio
n
s: Fix
a
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Petr Baudis
Adjust fo
r
the ne
w
way
o
f enabling the
d
efault post
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Fran
c
is Moreau
g
i
t-bisect: fix wrong usage of read(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
N
gu
y
ễ
n
Thái Ngọc Duy
Fix typo in
c
omments of longest_a
n
cestor_len
g
th()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Me
r
ge b
r
a
n
ch
'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Ha
m
an
o
R
e
-fi
x
rev-list-
o
p
tions documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C
Hama
n
o
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
next