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
Merge branch 'ss/cherry-pick-x-doc' into maint
2011-05-16
Junio C Hamano
Merge b
r
anch
'
ss/c
h
erry-pick-x-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge b
r
anch '
v
r/mer
g
e
-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Ham
a
no
Merge branc
h
'sr/m
a
int
-
fast-
i
mport-ti
g
hten-opt
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Me
r
g
e
branch 'jc/t1506-shell-pa
r
am-expansion-got
c
ha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
Hama
n
o
Merge branch
'
jc/fix-add-u-u
n
m
e
rged
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
Merg
e
branch 'jn/gitweb-depe
n
dency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'jc/maint-branch-mergeoption
s
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge bran
c
h 'jc/maint-add-p-o
v
erlap
p
ing-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim M
e
y
ering
Documentation/g
i
t
-
f
sc
k
.
txt
:
fix
typo
:
unreadab
l
e -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update draft release note
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Me
r
ge branch
'
cn/for
m
at-patc
h
-quiet
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
H
amano
Merge branch 'jm/m
e
rgetool-sub
m
odule
s
' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
Ha
m
ano
M
e
r
ge branch 'jk/
f
ormat-patch-quote-special-i
n
-
f
ro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge branch 'vh/git-svn-
d
oc' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
Ham
a
no
git_open_noa
t
i
m
e(): drop
u
nuse
d
para
m
et
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
h
a1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
a
d
d, merge, diff: do not use
s
trcasec
m
p
to comp
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
P
r
e
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
Hamano
Merge branch 'aw/
m
aint-
r
ebase-i-p
-
no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch 'js/bla
m
e
-
p
a
rsename' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'g
r
/cvsimport-alternativ
e
-cvspa
s
s-lo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'cj/p4m
e
rge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
e
rge branch 'jk/merge-one-file
-
working-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ha
m
ano
M
e
rge
b
r
anch 'jc/fix-diff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Hamano
Merge branch 'mz/mai
n
t-
r
ename-unmer
g
ed'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Herland
t5400: Fix
a
couple of typo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
t1507: a
v
o
id "${parameter<op
>
'
word'
}
"
i
nside d
o
uble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p-
f
ix
m
akes
the
l
ast test to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
akub Narebski
Remove gitweb/gi
t
web
.
cgi
a
nd other legacy ta
r
gets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
akub Narebski
git-instaweb: Simplify bu
i
ld
d
ependency 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
Juni
o
C Hamano
me
r
g
e
: make branch
.
<name>
.
m
ergeoptio
n
s
c
orre
c
tly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ão Britto
Remove
d
uplicated
"is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sv
e
rre Ra
b
belie
r
fast-
i
mp
o
rt: fix option parser for n
o
-arg op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t
3
701: fix he
r
e
d
ocument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hae
l
J Gruber
git-fast-import
.
txt: --relative-marks
t
ake
s
no param
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
ell:
add missing i
n
itialization of argv0_p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Bri
a
n Gernhardt
t/annotate-tests
:
U
se e
c
h
o
& cat in
s
tead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch 'jh/dirstat' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hama
n
o
Merge br
a
nc
h
'sp/maint-clear-postfiel
d
s' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ham
a
no
M
erge branch 'jk/
m
a
int-stash-oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'jk/
m
aint
-
upload-pack-shall
o
w' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'dm/s
t
ash-k-i-p
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge b
r
a
nch 'jc/pack-objects-bigfil
e
' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Me
r
ge branch 'mg/reflog
-
wi
t
h
-options' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'jk/st
a
s
h
-l
o
osen-safety' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge
bra
n
c
h
'ar/clean-rmdir
-
empty' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Me
r
ge bra
n
ch 'mg/sha1-path-adv
i
s
e' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin Haenel
git-add
.
t
x
t
: documen
t
'
a
d
d
.
ignor
e
Er
r
ors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Je
s
sup
Pa
s
s
em
p
ty file
to p4m
e
rge where no base
i
s
sui
t
able
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
ui
l
l
i
er
Look f
o
r password in both CVS and CVSNT password fi
l
es
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge-on
e
-file: fix broke
n
merges with a
l
ternat
e
w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
add tests for merge-in
d
ex /
m
erge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
"add -p
"
: work-
a
round an ol
d
laz
i
ness that does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
ad
d
-
-
intera
c
tive
.
perl:
factor o
u
t repeated
-
-reco
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a spli
t
hunk
i
n an "add -p" sessio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
io C Hamano
a
d
d -p: 'q' should really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
ma
n
o
St
a
rt 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
Merge branch
'
mg/x-year
s
-12-months'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
ab
o
t
git-send-
e
mail:
f
ix
miss
i
ng
space in error messa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jos
h
Stone
blame:
toler
a
te bogus e-mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
ndrew Wong
git
-
r
e
bas
e
--inte
r
a
c
tive
.
sh
:
preserve-merges fails
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
p
r
etty:
quote rfc822 specials in email addr
e
ss
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n Haen
e
l
git-svn
.
t
xt: s
m
all t
y
peface impro
v
eme
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
alen
t
in Haenel
git-svn
.
txt: move option descr
i
p
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valenti
n
Haen
e
l
git-svn
.
txt
:
fix usag
e
of
-
-a
d
d
-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Ham
a
n
o
http: clear POSTFIELDS when
ini
t
ializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
G
it 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io
C
H
amano
Fix
"
add
-
u
" that
somet
i
mes
fails to resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
diff-files:
s
how unmerged entries co
r
re
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often unused parameters from diff_unmerge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
diff
.
c: re
t
urn fil
e
p
a
i
r from
d
iff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
test
:
use $_
z
40 from tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: avoid "X years, 12
m
onths" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C
Hamano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
Sync
w
ith 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
el J Gr
u
b
er
git-svn
.
txt: Docu
m
ent
--m
e
rgei
n
f
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Jun
i
o
C Hamano
Rev
e
rt "r
u
n-comman
d
: pret
t
i
fy -D_FORTIFY_
S
OURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Sebast
i
an Schuberth
doc: Clarify
that "cherry
-
pick -x" does
n
ot us
e
"git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jo
n
athan Ni
e
der
Rest
r
ucture documentation
f
or git-merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vincent van Ravesteij
n
Documenta
t
ion: update
t
o git-merge
-
base --oc
t
opus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Juni
o
C Hamano
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2011-04-14
René Schar
f
e
a
rc
h
i
v
e
:
document limitation of
tar
.
umask c
o
nfi
g
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t
33
0
6,t530
4
: avoid clock skew i
s
sues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J Gruber
git
.
txt:
fix list continuat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Git
1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
ano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
ama
n
o
Merge bran
c
h '
j
c/re
v
-list-opt
i
ons-fix' into main
t
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
i
o
C
H
amano
Merge branch 'j
s
/
c
h
e
ckout-untracked-sym
l
ink' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
merge
t
o
ol: Teach abou
t
submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ji
m
Meyering
r
em
o
ve
dou
b
led
w
ords, e
.
g
.
,
s/to to/to/, and f
i
x
related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ra
m
kumar Ramachandra
r
evert
:
H
ide '-r' optio
n
in default usag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Car
l
os Martín Nieto
format-p
a
tch: doc
u
m
e
nt
-
-
q
uiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martí
n
N
i
e
to
format-pat
c
h:
d
on't pa
s
s o
n
the --quiet flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-
dir
s
tat
:
In cas
e
of renames, use target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch 'js
/
checkout-untrack
e
d-s
y
mlin
k
'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
a
mano
Merge bran
c
h
'nd/init-git
d
i
r'
commit
|
commitdiff
|
tree
2011-04-12
J
o
h
annes Sixt
t
2
0
21: mark
a t
e
s
t as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t00
0
1: gu
a
r
d
a new test with SY
M
LI
N
KS
prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next