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 draft release notes
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
M
e
rg
e
branch 'jn/
m
aint-forma
t
-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
ano
Merge bran
c
h 'ss/cher
r
y-pic
k
-x-
d
o
c'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
H
am
a
n
o
Merge
branc
h
'vr/m
e
rge-
b
as
e
-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
ma
n
o
Mer
g
e br
a
nch 'sr/ma
i
nt-fast-imp
o
rt-tighten-option-par
s
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
ama
n
o
Mer
g
e
bra
n
ch 'j
c
/t1506-sh
e
ll-param-expansion-got
c
ha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'j
c
/
fix-ad
d
-u-unmerged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Me
r
g
e
b
r
anch
'jn/gitweb-d
e
pend
e
ncy' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'jc/maint-br
a
nch-m
e
rgeoptions
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
e
r
ge branch
'jc/m
a
int-
a
dd-p-overlap
p
in
g
-hunks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Meyering
Documentation/
g
it-fs
c
k
.
tx
t
: fix t
y
po:
unread
a
b
le -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Update dra
f
t 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
H
amano
Merge branch 'cn
/
form
a
t-patch-qui
e
t' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge branch
'
jm/
m
e
rgeto
o
l-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge
b
r
anch 'jk/for
m
at-patch-q
u
ote-spe
c
ial
-
in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
git_open_
n
oatime(): drop
u
nu
s
ed parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hama
n
o
s
ha1_file: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan
N
ieder
a
d
d, merge, diff: do not use strc
a
secmp to compar
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Prep
a
re f
o
r 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Hamano
Merge bran
c
h 'aw/mai
n
t-rebas
e
-i-p
-
no-f
f
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merg
e
branch 'js/blame-parsename'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C Ha
m
ano
Me
r
ge branch '
g
r/
c
vsimpor
t
-alternati
v
e-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
branch
'cj/p4merge' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge bran
c
h 'jk/merge-
o
ne-file-working-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch
'
j
c/fix-diff
-
f
i
l
e
s-unme
r
ged' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'
mz/maint-r
e
n
ame-unm
e
r
ged' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Ha
m
ano
t
1507: av
o
id "${paramet
e
r
<
o
p
>'word'}
"
inside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701:
add-p-f
i
x mak
e
s the last
tes
t
to
p
ass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
rebski
Remove gitweb/gitweb
.
cgi
a
n
d other legacy targets 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 Na
r
ebski
git-instaweb: Simplify b
u
ild 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
Junio C Hamano
merge: make bran
c
h
.
<name>
.
mergeoptions correctly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
R
e
move d
u
plica
t
e
d "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sv
e
rr
e
Rabbelier
fas
t
-
i
mport
:
fix option parser for no-arg o
p
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Hamano
t3
7
01: fix h
e
re document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
ichael J Gruber
git
-
fast
-
import
.
tx
t
: --relative-marks
t
ake
s
no
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sh
a
rov
shell: a
d
d missing i
n
itialization of a
r
gv0
_
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian G
e
rnhard
t
t/an
n
otate-tes
t
s: Use echo & cat instead
of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
G
it
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge
b
ra
n
c
h
'
jh/dirstat' into
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
erge branch 'sp/maint-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branch 'jk/maint-stash-oob' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C Haman
o
Mer
g
e bran
c
h
'jk/
m
aint-upload-pack-s
h
allo
w
' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge
bra
n
c
h
'dm/sta
s
h
-
k
-i-p
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
a
nch 'jc/pack
-
o
b
jects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
e
rge br
a
nc
h
'mg/refl
o
g-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
H
amano
Mer
g
e
b
r
a
n
ch 'jk
/
stash
-
lo
o
s
en-s
a
fety' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ar/
c
le
a
n-rmdir-
e
mpty'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
erge b
r
anc
h
'mg/sha1-
p
ath-adv
i
se' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
V
alentin
Haenel
git-ad
d
.
txt: docu
m
e
n
t
'
add
.
ignoreErr
o
rs'
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
P
a
ss e
m
p
t
y file to p4mer
g
e
where no base is sui
t
able
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Lo
o
k
for password in both
CVS and CVSN
T
p
a
s
s
word files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merg
e
-one-
f
ile: fix broken
merges with a
l
ternate
work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
a
d
d
t
ests fo
r
merge
-
i
ndex /
merge
-
on
e
-
fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
"ad
d
-
p
"
: work-around
a
n
old laziness
t
hat does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
add--interact
i
ve
.
perl: factor out repeated
--recou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C
H
am
a
no
t3
7
01: Ed
i
ting a
s
plit hunk i
n
an "add -p" sessi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
uni
o
C Ham
a
no
add -p: 'q' s
h
ould real
l
y quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
Me
r
ge branch '
m
g/x-
y
ears-12-mont
h
s' into m
a
int
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvain Ra
b
ot
git-sen
d
-
email
:
fix miss
i
ng spa
c
e in
e
rror m
e
s
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh
Stone
blame: t
o
lerate
bogus e-
m
a
il
a
d
d
resse
s
a bi
t
better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
An
d
r
e
w Wo
n
g
git-reb
a
se
-
-interacti
v
e
.
sh: pre
s
erve-m
e
r
g
es
f
ails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pre
t
ty: quote rfc822 specials in
email ad
d
res
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
g
i
t-svn
.
txt: smal
l
t
y
pef
a
ce improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
entin Haenel
g
i
t
-sv
n
.
txt: move
op
t
ion descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
gi
t
-
s
vn
.
t
xt: fix u
s
age of --add-a
u
thor-fro
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: clea
r
POSTFIELDS wh
e
n in
i
tializing
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 Hamano
Fix "add
-u" that s
o
m
e
t
imes
fail
s
to reso
l
ve unme
r
ged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
diff-files: show unmerged en
t
ries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
di
f
f:
r
emove often
u
n
used parameter
s
from diff_
u
nmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C H
a
mano
dif
f
.
c
: return filep
a
ir f
r
om
d
i
f
f_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
Ha
m
ano
test: use $_z
4
0 fr
o
m te
s
t-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
da
t
e: avo
i
d
"
X
y
e
a
r
s, 12 mon
t
hs"
i
n rel
a
t
i
ve dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C H
a
m
ano
Git
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Ha
m
an
o
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hael J
Gruber
git-svn
.
tx
t
: Document
--mergeinf
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
R
eve
r
t
"run-command:
p
rettify -D_FO
R
TIF
Y
_SOURCE workaroun
d
"
commit
|
commitdiff
|
tree
2011-04-15
Sebas
t
i
a
n Schub
e
rth
doc: Clarify that
"
cherry-pick -x" doe
s
not u
s
e "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Docu
m
entation: describe the format of messages wit
h
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jona
t
ha
n
N
ied
e
r
Restructure
d
ocumenta
t
i
on for
git-merge-base
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vincent van Ravesteijn
Docu
m
entation: update
to git-
m
er
g
e-base --octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Ha
m
ano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archiv
e
: document l
i
mitation o
f
ta
r
.
umask config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
Grub
e
r
t
3306,t5304: avoid clo
c
k
skew issu
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mich
a
el J Gruber
git
.
txt: fix list con
t
inuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
G
i
t 1
.
7
.
5-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'jc/rev-list-options
-
fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branc
h
'js/checkout-u
n
tracked-symlink'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: Teach
a
b
out
submodu
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jim
M
ey
e
ring
remove
dou
b
led words, e
.
g
.
, s/t
o
to/to/, an
d
fix rel
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachan
d
ra
revert: Hide '
-
r
'
option in defaul
t
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carl
o
s Martín
N
i
eto
forma
t
-patch: doc
u
ment
-
-qu
i
et option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
C
ar
l
os
Martín Nieto
fo
r
mat-patch: don
'
t pa
s
s on the --quiet f
l
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
r
l
and
--dirstat: In case of renames,
u
s
e target filenam
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
u
nio C Hamano
Merge branch 'j
s
/checkout-untra
c
ke
d
-symlink'
commit
|
commitdiff
|
tree
next