repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
bisect: refactor sha1_array into a generic sha1 list
2011-05-20
Jeff
King
bis
e
ct: refac
t
o
r
sha1_arr
a
y into a generic sha1 list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
refactor refs_from_alternate_cb to allow pas
s
i
n
g extra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update dr
a
ft release
n
o
t
e
s
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch
'jn/maint-format-pat
c
h-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
man
o
M
e
rge branc
h
'ss/cherry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
Hamano
Merge b
r
anc
h
'v
r
/m
e
rge-base-doc'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch 'sr/ma
i
nt-fast-imp
o
r
t-tighten-op
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'jc/t1506-
s
hell-param-expansion-g
o
tcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Merg
e
branc
h
'jc/f
i
x-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
ama
n
o
Merge b
r
a
n
ch 'jn/gitweb-depende
n
cy' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ha
m
a
n
o
Mer
g
e branch 'j
c
/
maint-branch-mergeopti
o
ns'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
anch '
j
c/
m
aint-add-p-overlapping-h
u
nks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Docume
n
ta
t
ion/
g
it-fsck
.
txt:
f
ix typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Updat
e
draft relea
s
e
no
t
e
s to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
no
Me
r
ge branch 'cn/for
m
at-patch-quiet' into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge branch 'jm/mergetool-submo
d
ules'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge branch 'jk/form
a
t-p
a
t
c
h-quo
t
e-special-i
n
-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Mer
g
e branch 'vh/git-
s
vn-doc' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Ham
a
no
git_
o
pen_noatime():
d
rop unused p
a
rame
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
sh
a
1_fil
e
: typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan
N
ie
d
e
r
add, merge, dif
f
: do not use strca
s
ecmp to c
o
mpare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ha
m
ano
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
n
o
Merge branch '
a
w/mai
n
t-rebase-i-p-no
-
ff
'
into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
am
a
no
Merge branc
h
'js/bla
m
e-parsename' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
Merge
br
a
nch 'gr/c
v
simport-al
t
ernative-
c
v
s
pass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C
Hamano
M
erge branch
'
c
j/
p
4merge'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jk/merge
-
o
n
e-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
Merge bran
c
h
'
jc/fix-diff-files-unme
r
ged
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge b
r
anc
h
'mz/maint-rena
m
e-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
ohan
H
erland
t
5
400: Fix
a couple of t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
unio
C Hamano
t1507: avoid "${parameter<op>'w
o
rd'}" insi
d
e
double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701
:
add-p-
f
ix makes the
l
ast test to
p
ass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
akub Narebski
Remove gitweb/gitweb
.
c
g
i and other l
e
gac
y
t
a
rgets 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 Narebs
k
i
git-inst
a
w
eb: Simplif
y
b
uild dependenc
y
on
g
itweb
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 H
a
mano
m
e
rge:
m
a
ke
b
ranch
.
<name>
.
merge
o
pt
i
ons correctly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João B
r
i
tto
Remove dupl
i
cated "is a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbe
l
ier
f
a
s
t
-
impor
t
: fix
option
p
ars
e
r for no-arg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: f
i
x her
e
docu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J Gruber
g
i
t
-
f
a
s
t
-
i
m
p
ort
.
t
xt: --relat
i
v
e-marks takes
no pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharo
v
shell: ad
d
missin
g
initialization of a
r
g
v0_
p
a
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
r
i
a
n Gernhardt
t/ann
o
tate-
t
ests: Use echo & cat i
n
st
e
ad of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge branch 'jh/dirstat' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
ano
Merge branch 'sp/mai
n
t
-clear-
p
o
s
tfields' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branc
h
'jk/maint-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch 'jk/mai
n
t-uplo
a
d
-
pack-shallow' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C H
a
m
ano
Merge branch 'dm/stash-k-i-p' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
m
ano
Merge branch 'j
c
/pack-ob
j
ects-bigfil
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
Ha
m
ano
Merge
b
ranch '
m
g/re
f
log-with-options
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jk/stash
-
l
o
ose
n
-
safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
Me
r
ge branch 'ar/
c
le
a
n-rmdir
-
empty' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Haman
o
Merg
e
bra
n
ch
'mg/s
h
a
1-
p
ath-advis
e
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin Hae
n
el
git-add
.
txt: do
c
um
e
nt 'add
.
ignoreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciara
n
Jessup
Pass empty file to p4merge where no base is s
u
itable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y
Ro
u
i
l
lier
Look
for password in both CV
S
and CVSNT pa
s
sword
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
merg
e
-one-file:
f
ix
b
rok
e
n
merg
e
s with alternate wor
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
dd test
s
f
or m
e
rge-ind
e
x
/ merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C
H
a
mano
"
a
dd -p": work-around
an
old laziness that does
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
add--int
e
ra
c
tive
.
pe
r
l: factor out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
t3701: Editing a split hu
n
k
i
n
an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
a
n
o
add -p:
'
q' should
re
a
lly
q
u
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
uni
o
C Hamano
Start
1
.
7
.
5
.
1 mai
n
tenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch 'm
g
/x-ye
a
rs-12-months' into m
a
int
commit
|
commitdiff
|
tree
2011-04-29
S
ylvain Rabot
gi
t
-
s
end-
e
mail: fix
miss
i
n
g space in error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jos
h
S
t
one
blame: tol
e
rate bogu
s
e-mail addresse
s
a
bit bett
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
A
n
drew Wong
g
it-
r
e
b
as
e
--inter
a
ctive
.
sh: pres
e
r
v
e-merges fails o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff
K
ing
pretty: quote
r
f
c822 spe
c
ials in
e
mail addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n Haenel
git-sv
n
.
txt: small typeface i
m
provements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
git-svn
.
t
x
t
: mo
v
e
o
ption de
s
cri
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haenel
git-svn
.
txt:
fix
u
sage of --add-author
-
from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C Hamano
http: clear PO
S
T
F
IEL
D
S
w
hen initi
a
l
i
z
ing a sl
o
t
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
Ju
n
io C Hama
n
o
F
i
x "add
-
u" that so
m
e
t
imes f
a
i
l
s to reso
l
ve
u
nmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
diff-files: s
h
ow unmerg
e
d e
n
tries correc
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
a
n
o
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 Hamano
diff
.
c: return fi
l
e
pair from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
t
est: use $_
z
4
0
from tes
t
-li
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Mic
h
ael
J
Gru
b
er
dat
e
: avoid "X
y
ears, 12 months" in relat
i
ve dat
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C
H
amano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sync with
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
Git
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-svn
.
txt
:
Document
-
-mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio
C Hama
n
o
R
evert "run
-
command: prettify -D_F
O
RTIFY_
S
OURCE workar
o
und"
commit
|
commitdiff
|
tree
2011-04-15
Seb
a
st
i
an
S
c
huberth
doc: Clarify tha
t
"cherry
-
pick
-
x" d
o
es not
use "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
o
natha
n
N
ieder
Do
c
ument
a
tion: describe the forma
t
of mess
a
ges
with
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jon
a
t
h
an N
i
eder
R
e
struct
u
re documentation for gi
t
-merge
-
ba
s
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vincent van
Raves
t
eijn
Document
a
tion: upda
t
e to git
-
mer
g
e-base --oct
o
pus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Jun
i
o C Ha
m
ano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René
S
char
f
e
arc
h
ive: document limitatio
n
of tar
.
umask config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J Gruber
t3306,t
5
304: a
v
oid clock skew i
s
sues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
Gruber
g
i
t
.
txt
:
fix
lis
t
contin
u
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
io
C Ham
a
no
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Me
r
ge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Me
r
g
e branch '
j
c/rev-list-options-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
Merge
b
r
a
nc
h
'j
s
/check
o
ut-un
t
racked-syml
i
nk' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jonatho
n
Mah
merg
e
tool: Teach
ab
o
ut subm
o
d
u
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
im Meyering
remove doubled
w
ords, e
.
g
.
, s/to
t
o/
t
o/
,
and
f
i
x relate
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramac
h
andra
revert:
H
ide '-r'
option
i
n
default usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín Ni
e
to
f
ormat-patch: docu
m
e
nt
--qui
e
t
opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín Niet
o
fo
r
mat-pa
t
ch: don't pass on
t
he
--qu
i
et
flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next