repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update draft release notes to 1.7.5.2
2011-05-16
Junio
C Hamano
Update draf
t
r
el
e
ase
notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge branch 'jn/maint-format-patch
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Ha
m
an
o
Me
r
ge
b
r
anch 'ss/cherry-pi
c
k
-
x-do
c
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'vr
/
mer
g
e
-base-doc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Mer
g
e branch 'sr/maint-fast
-
import-tigh
t
en-o
p
tion-p
a
rsin
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/t1506
-
shel
l
-param-expansi
o
n-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merg
e
b
r
anch
'j
c
/fix-
a
dd-u
-
un
m
e
r
ged' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
Ham
a
no
Me
r
ge branc
h
'
jn/g
i
tweb-dependency' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
ranch 'jc/
m
aint-branch-m
e
rgeoptio
n
s'
i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hama
n
o
Merge branch '
j
c/maint-a
d
d-p-overlappi
n
g-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im M
e
yeri
n
g
Documen
t
at
i
o
n/git-fsck
.
txt: f
i
x t
y
po: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
n
o
U
pdate draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merg
e
branch 'cn/format-patch-quiet' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C H
a
mano
M
erge
branch 'jm/
m
erg
e
tool-su
b
mo
d
ules'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jk/format-patch-quote-s
p
ecial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
am
a
no
Merge
b
ranch 'vh/git-svn
-
doc' into main
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
g
it_
o
pen_no
a
time()
:
drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hama
n
o
sha1_fi
l
e
:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
a
dd,
merg
e
,
diff
:
d
o
no
t
use
s
trcasecmp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
ano
P
repare
f
or
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
am
a
no
M
e
r
ge branch '
a
w/main
t
-rebase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'js/bl
a
me-parsename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Merge b
r
anch 'g
r
/cv
s
im
p
ort-alternative-cvspass-l
o
cation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cj
/
p4mer
g
e' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'jk/m
e
r
g
e
-
one-file-working-tree'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
mano
Merge br
a
n
ch 'jc/fix-d
i
f
f-fi
l
es-u
n
merged' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merg
e
branch 'mz/
m
ain
t
-rename-unmerged' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5400:
Fi
x
a
c
oupl
e
of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
ano
t1507: avoid "${parameter<op>'word'}
"
inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Haman
o
t3701: add-
p
-
fix makes the last tes
t
to pa
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub
N
arebski
R
e
move gitweb/gitw
e
b
.
c
g
i
and
other legacy
t
argets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub
Narebski
g
i
t-instaweb:
S
implify build dependency on gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
H
a
mano
merg
e
:
mak
e
branch
.
<n
a
me
>
.
mer
g
eop
t
ions cor
r
ectly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oão B
r
it
t
o
R
e
move
du
p
licate
d
"is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverr
e
Rabbelier
f
ast-import: fix option parser for no-arg
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
t3701: fix
here
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gru
b
er
g
it-
f
ast-
i
mport
.
txt
:
--relat
i
v
e
-mar
k
s ta
k
es
no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
D
i
ma Sharov
shel
l
: a
d
d m
i
ssing initia
l
ization
of argv0_pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
rian
Ger
n
hardt
t/annot
a
te-test
s
:
Use echo & cat in
s
tea
d
of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Haman
o
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
M
erge branch
'jh/di
r
stat' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merg
e
branch
'
sp/maint-clear
-
postf
i
elds' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'jk/m
a
int-stash-oob' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
M
e
rge
b
ranch
'jk/maint-uplo
a
d-pa
c
k
-
sh
a
llow' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Ham
a
no
Merge branch 'dm/st
a
sh-
k
-i-
p
' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
M
e
r
g
e branch
'
jc/pa
c
k-ob
j
ects-
b
igfi
l
e' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Merge branch 'mg/reflog-with-options' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
erge br
a
nch
'
j
k/sta
s
h-loose
n
-sa
f
ety' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o
C Hamano
Merge
bra
n
ch 'ar/cl
e
an-
r
m
dir-empt
y
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hamano
M
e
rge
b
ranc
h
'mg/s
h
a1-path-advise'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
g
i
t-add
.
t
x
t: document 'ad
d
.
ignoreErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass
empty file to p4merge where
no
b
a
se is s
u
itable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Gu
y
Rou
i
llie
r
Look
f
or password in bo
t
h CVS and CVSNT passw
o
r
d files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
i
ng
m
erge-one
-
fi
l
e: f
i
x broken merges with alternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests
for mer
g
e-ind
e
x / merge-o
n
e-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
"add -p":
w
or
k
-
ar
o
und an
old laziness tha
t
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
i
o
C Hamano
add--interac
t
ive
.
perl
:
fa
c
t
o
r
o
ut
r
epeated --reco
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
t370
1
:
E
diti
n
g
a split hunk in an "
a
dd -p" se
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Ha
m
a
n
o
add -p: 'q
'
should
r
eally qui
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1
m
aintenance
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Mer
g
e bran
c
h 'mg/
x
-years-12-
m
onths' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-s
e
nd-emai
l
: fix mi
s
sing space in er
r
or message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tolerat
e
bogu
s
e
-
mail add
r
ess
e
s a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Won
g
g
i
t
-
re
b
ase--inter
a
ctive
.
sh:
prese
r
ve-merges fail
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pr
e
tty: quot
e
r
f
c
8
22 specials
in em
a
il
a
d
dresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n Hae
n
el
g
i
t
-
svn
.
txt: small typef
a
ce impro
v
e
m
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in
Ha
e
nel
git-svn
.
tx
t
: move option descriptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haenel
git-svn
.
txt: fix usage o
f
--add-aut
h
o
r
-fro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C Haman
o
http: clear P
O
STFIE
L
D
S when initial
i
zing
a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
Fix "add -u" that someti
m
es fails to res
o
lve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff-
f
iles: show unme
r
ged en
t
ri
e
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
d
i
ff: r
e
mov
e
often
u
nused parameters f
r
om
diff_unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c
:
r
eturn
f
ilepair from
d
iff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_
z
40 fr
o
m test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Micha
e
l J Gruber
date: avoid "X yea
r
s, 12 m
o
n
t
hs
"
in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Git 1
.
7
.
5
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio
C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C
Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mic
h
a
e
l J Gruber
git-svn
.
txt: D
o
cument --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
unio C
H
amano
Revert "run-command: prettify -D_FORTIFY_SOURCE workar
o
u
n
d"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian Sch
u
ber
t
h
doc: Clarify th
a
t "c
h
er
r
y-pick -x"
does not use "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Niede
r
Documentation: de
s
cribe the format of messages with
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonat
h
an Nieder
Restru
c
ture d
o
cumentat
i
on
f
or git
-
merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vin
c
en
t
van Ravesteijn
Document
a
tion:
u
pdate to git-merge-base -
-
o
c
to
p
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
M
e
rg
e
br
a
nch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2011-04-14
René
S
ch
a
rfe
archive: d
o
cument l
i
mitation of tar
.
umask config
se
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t5304:
a
void clo
c
k skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mich
a
e
l
J G
r
uber
git
.
txt:
f
ix list continuat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
G
it 1
.
7
.
5-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
io C Ha
m
a
n
o
Me
r
g
e
bran
c
h 'jc/rev-li
s
t-opti
o
n
s-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hama
n
o
Merge
b
ran
c
h
'js/check
o
ut
-
unt
r
acked-symlink' in
t
o
maint
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: T
e
ach about
submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Me
y
erin
g
remove d
o
ubled words,
e
.
g
.
, s/to to
/
t
o
/, and fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
revert: Hide '-r' option in
d
efault usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
M
artín Nieto
for
m
at-patch: document --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
C
arlo
s
Martí
n
Nieto
f
o
rmat-
p
atch:
d
on't pass on th
e
--quiet
f
lag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case of renames,
u
se target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C H
a
mano
Merge
branc
h
'
js/checkout-unt
r
a
c
ked-syml
i
nk'
commit
|
commitdiff
|
tree
next