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
git-merge documentation: more details about resolving conflicts
2008-08-23
Da
n
H
ens
g
en
git-m
e
rg
e
doc
u
mentation: mo
r
e details about resolvi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex Ries
e
n
Extend "checkout
--track" D
W
IM to supp
o
rt more cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jo
n
atha
n
d
el Strother
Revert
"
Convert o
u
tpu
t
messages in merge-recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C
H
amano
te
m
p
l
a
t
es/Make
f
i
l
e: inst
a
ll is unnecessar
y
, jus
t
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Br
a
ndon Cas
e
y
r
e
mote
.
c: ad
d
a function f
o
r deleting a
refspec ar
r
ay
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
es S
i
xt
filter-bran
c
h: Grok
s
peci
a
l c
h
ar
a
cters
in
t
ag
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johanne
s
Schindelin
test-lib: d
o
not remove trash_director
y
if called w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzi
n
i
provide m
o
re errors for the "
m
er
g
e
i
n
t
o
empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pearce
Make
r
e
f
l
og qu
e
ry
'
@{1219188291}'
a
ct as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
conf
i
g
.
mak
.
i
n: Pass on LDFLAGS f
r
om confi
g
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
c
ompa
t
/snprintf
.
c:
h
andle snprintf'
s
that
a
l
ways return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Joh
a
n
Herland
Te
a
ch "gi
t
diff -p" HTML
f
uncname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kir
i
ll Smelkov
Teach "
g
it diff -p" Python func
n
a
me patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
git-svn:
f
i
x dcommit to urls wit
h
embedded
u
se
r
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C H
a
mano
M
e
rg
e
branch 'ml/subm
o
dule-f
o
reac
h
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'pm/log
-
exit-
c
o
d
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge b
r
anch
'sb/commit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
i
o
C H
a
mano
Merge bran
c
h 'pb/ref
l
og
-
dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Merge branch 'jc/add-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
M
erge branch 'kh/
d
iff-tree'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
io C Ha
m
ano
Merge b
r
anch
'mg/cou
n
t
-objects'
commit
|
commitdiff
|
tree
2008-08-21
J
uni
o
C Hamano
M
e
rge
b
ranch 'mz/push-ver
b
ose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Merg
e
branch
'jc/index-extended-fl
a
gs'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
M
e
rg
e
br
a
n
ch '
c
c/m
e
rge
-
base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge
bran
c
h 'j
c
/
test
-
d
ee
p
e
r
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
Mer
g
e
branch 'js/parallel-test'
commit
|
commitdiff
|
tree
2008-08-21
Brando
n
C
a
sey
re
v
ision
.
h
: make
s
h
ow_early_o
u
tput an extern which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Upda
t
e draft release notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C
H
ama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
U
p
date
dra
f
t release n
o
tes
f
or 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
T
ar
m
igan Casebol
t
Add
hint
s
to revert documentati
o
n about other wa
y
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johann
e
s
S
i
xt
I
n
stall
t
e
mp
l
ates
with the user and
group of the instal
l
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
"git-merge": allow fast-forwarding in a stat-dir
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C H
a
mano
comple
t
i
on: find out
s
u
p
ported me
r
ge strategies correctl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jef
f
Kin
g
decorate: allow const objects to be decorated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
for-each-ref: cope with ta
g
s w
i
th
incomplete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
d
iff --check: do not get confuse
d
by
n
ew
blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Me
r
ge branch 'bd/dif
f
-strb
u
f'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Me
r
ge branch 'dp/ha
s
h-literally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'js/
c
heckout-dwim-lo
c
al'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
H
amano
Merge
br
a
nch
'ph/enable-thr
e
aded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branc
h
'
j
k/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C
Hamano
Me
r
g
e bran
c
h '
r
s/imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
Merge branch 'js/
m
i
ngw-s
t
at
'
commit
|
commitdiff
|
tree
2008-08-20
Jim
M
e
y
eri
n
g
re
m
ote
.
c: remo
v
e
use
l
ess if
-
before-free test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
e
ff
K
i
n
g
mailin
f
o
:
avoid viol
a
ting strbuf assertion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
i
m Meyer
i
n
g
r
e
w
ord --full-
i
ndex descrip
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Mey
e
ring
S
u
bmittingPatches: fi
x
a typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
im Mey
e
ring
add boo
l
e
an d
i
ff
.
suppress-blank-empty
c
o
nfig opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ji
m
Meyering
gi
t
format-patch:
a
void underrun when for
m
at
.
headers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
unio C H
a
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-19
Brandon Casey
t1002
-
read-tree-m-u
-
2way
.
sh: use 'git diff
-
U0'
rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Marcus Griep
U
pdate
t
/
.
g
itignore t
o
igno
r
e
a
ll trash
d
irectories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
ohannes Sixt
R
eve
r
t "Wi
n
dows: Use a custo
m
iz
e
d st
r
uct
s
t
at tha
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
c
ompat: introduce on
_
disk_
b
yt
e
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
R
o
bert Sc
h
iele
adap
t
git-
c
vsserver
m
anpage to dash-free syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Don Zickus
mailinfo: re-fix MIME mu
l
tipart bo
u
ndary pa
r
si
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mark Leveda
h
l
git
-
submodu
l
e - Ad
d
'foreach' su
b
c
o
mm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
S
t
e
p
han Beyer
Fi
x
co
m
mit
_
tree() bu
f
fer
leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter
Val
d
emar Mørch
Teach git
lo
g
--exit-code to return
a
n
appropria
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar
M
ø
rch
Teach git log
-
-check to return an appro
p
riate exit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Piet
e
r de Bie
buil
t
in-ref
l
og: Al
l
o
w reflog e
x
pire to n
a
me parti
a
l ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Ham
a
no
Start 1
.
6
.
1 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
amano
Start
1
.
6
.
0
.
X maintenan
c
e se
r
ie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio 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 g
i
t-g
u
i 0
.
1
1
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
M
e
rg
e
branch 'ak/
p
4'
commit
|
commitdiff
|
tree
2008-08-17
Marcus
G
r
i
ep
coun
t
-objects: Add total pack size to verbose o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
amano
tests:
use $
T
EST_DIRE
C
TOR
Y
to re
f
e
r t
o
the t/ di
r
ectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Marek Zawirski
Make pu
s
h more
v
e
rbose about illega
l
c
ombination of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
ama
n
o
inde
x
: future proof for "ex
t
ended
"
in
d
ex
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Robert Blum
git-p4: chdir now properly sets PWD environm
e
n
t
variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan B
e
yer
Impro
v
e er
r
or
output of git-r
e
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mikl
o
s Vaj
n
a
t9300: replace '!' with
t
est_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C Ham
a
n
o
Mer
g
e
git:
/
/
git
.
kernel
.
org/p
u
b/s
c
m
/
gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Mar
c
us Griep
Git
.
pm
:
Make File::Spec
a
n
d File::Temp require
m
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s V
a
jn
a
D
o
cumentation: document
t
he
p
ager
.
*
c
o
nfiguration
s
e
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
S
teph
a
n Beye
r
git
-
stash: improve synopsis in
h
elp and manual pa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eric Bla
k
e
M
a
kefile: bu
i
lding
g
i
t
i
n
c
ygwin 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
S
tephan
B
eyer
g
i
t-
a
m: ignore --
b
inary
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
b
as
h
-complet
i
on: A
d
d
non-command git help
files to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Ale
x
Ri
e
s
e
n
Fix t3700 on filesys
t
ems which do not s
u
p
p
ort question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Anan
d
Kumria
Utilise our
new p4_
r
ead_pi
p
e and p4_write_pipe wrapp
e
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
An
a
n
d K
u
mri
a
A
dd p4 read_pipe
a
nd write_
p
ip
e
wrap
p
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
bash comple
t
ion: Add '--merge' long
option for 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Mar
l
ow
bash completi
o
n: Add completi
o
n for 'gi
t
merg
e
too
l
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Matt McCutchen
git format-patch do
c
u
m
entation: clarify what
-
-c
o
ver
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Eric
Ra
i
ble
bash
completion: 'git apply'
s
hould us
e
'fix' not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C H
a
mano
x
d
if
f
-inte
r
f
a
c
e: hide t
h
e whole "xdiff_e
m
it_sta
t
e"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian
Down
i
ng
Use
s
t
rbuf for st
r
uct x
d
iff_e
m
i
t_state's remain
d
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian Do
w
n
i
ng
Make xdi_diff_outf i
n
terfac
e
for running xdiff_
o
utf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Ha
m
ano
Mer
g
e branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
t5304-prune: a
d
ju
s
t file mtime based o
n
sys
t
e
m time
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Cas
e
y
test-
p
arse-o
p
t
i
ons: u
s
e app
r
o
priate cast in length_
c
allback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
K
e
vin Ballard
F
ix
escaping
of glob sp
e
cial
charact
e
rs in
p
athspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
r
e
base -i -p: fix parent
rewriting
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
r
e
base -i -p:
h
andle index a
n
d workd
i
r c
o
rre
c
t
l
y
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C
Hamano
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C H
a
mano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
next