repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t3503: test cherry picking and reverting root commits
2011-05-16
Je
f
f K
i
ng
t3503: test cherry pick
i
ng
a
nd re
v
erting root commi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
reve
r
t: allow
r
ev
e
rting
a
root commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
cherr
y
-pick: handle root com
m
its w
i
th
extern
a
l strateg
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Update
d
raft release
n
o
tes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'cn/format-p
a
tch-qui
e
t' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
H
amano
Merge br
a
n
c
h
'jm/mer
g
etool-submo
d
ules' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Mer
g
e
branch 'jk/f
o
rmat-p
a
tch-quot
e
-special-in
-
from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merge br
a
n
ch 'vh/git-sv
n
-doc' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
git_op
e
n_no
a
t
i
me(): drop unu
s
e
d pa
r
a
m
ete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
s
ha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, m
e
rge
,
diff: d
o
n
o
t use
s
trca
s
ecmp to com
p
a
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Haman
o
Pre
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
ano
M
e
rge branch 'aw/maint-rebase-i-p-no-ff'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
r
ge branch
'
j
s
/blame-parsename' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimport-a
l
tern
a
t
ive-cvspa
s
s-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
e
r
g
e
b
r
anch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Merge b
r
anch '
j
k/merge-
o
ne-file-wo
r
k
in
g
-tree' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'jc/fi
x
-diff-f
i
les-unme
r
ged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
br
a
nch 'mz/maint
-
rename-u
n
merg
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
a
n
d
t5400: Fix a c
o
up
l
e of t
y
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
R
emove duplicate
d
"is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
t3701: fix her
e
docume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
gi
t
-fa
s
t-impo
r
t
.
txt:
-
-re
l
ative-marks takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Shar
o
v
shell: add mi
s
sing initializ
a
t
i
on o
f
argv0
_
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian
G
e
rnhardt
t/annota
t
e-tests: Use ec
h
o &
cat instead
o
f sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Mer
g
e
b
ranch 'j
h
/di
r
s
t
at'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hama
n
o
Merge branch '
s
p/ma
i
n
t
-clear-postfie
l
ds' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jk/maint-stash-oob' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge bra
n
ch 'jk/maint-upl
o
ad-p
a
c
k
-shallow' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Me
r
ge branch 'dm/
s
tash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
br
a
nch 'jc/pac
k
-objects-bigf
i
le
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o
C
H
am
a
no
Merge branch
'mg/ref
l
og-w
i
th-options'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge branch 'jk/stash-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Haman
o
Merge b
r
anch 'ar/clean-rmdir-
e
mpty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'mg/s
h
a
1
-
p
ath-adv
i
se' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valent
i
n Haenel
git-add
.
txt: document '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
Ciaran
J
e
ssup
Pass empty f
i
le
to p4
m
e
r
ge where n
o
base is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for pa
s
sw
o
rd in bo
t
h CV
S
and C
V
SNT
p
assword f
i
les
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-o
n
e-f
i
l
e: fix
b
r
oken merges with alternate wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests
for m
e
rge-in
d
ex /
merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
n
o
Start
1
.
7
.
5
.
1 maintenance t
r
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge br
a
nc
h
'm
g
/x-years-12-mon
t
h
s' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-04-29
Syl
v
ain Rab
o
t
git
-
send
-
email: fix missing
space
i
n
error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
b
lame: toler
a
te bogus e-mail addres
s
es a b
i
t better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-rebase--intera
c
tive
.
sh: pre
s
e
rve-merges fa
i
ls on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff
King
p
retty:
qu
o
te r
f
c
8
2
2 specia
l
s in
email
a
ddresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
nt
i
n Haene
l
g
i
t-svn
.
txt:
small typeface improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
Haenel
git-svn
.
txt: move option des
c
r
iptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haenel
g
i
t
-svn
.
txt: fix usage of
-
-a
d
d-au
t
hor
-
from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C Hamano
http: clear POSTFI
E
LDS when initializing a slo
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hama
n
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio
C
Hamano
d
i
f
f-fi
l
es: show
u
nmerged entries correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
diff: remove of
t
en unus
e
d paramet
e
rs from d
i
ff_unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
d
i
ff
.
c: r
e
t
urn filepair fr
o
m
di
f
f_unme
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
test: use $_z
4
0 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J
G
rub
e
r
date: avoid
"
X years, 12 months" i
n
re
l
ative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio
C
Hamano
Git 1
.
7
.
5-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C Hama
n
o
Sync wi
t
h
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Ha
m
ano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gru
b
er
git-sv
n
.
txt: Docume
n
t --m
e
rgeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Jun
i
o
C Ha
m
ano
Revert "
r
un-command
:
pr
e
ttify -D_FORTIFY
_
SOURCE workaroun
d
"
commit
|
commitdiff
|
tree
2011-04-14
Juni
o
C
Haman
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: docum
e
nt
lim
i
tation of tar
.
umask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J Gr
u
ber
t33
0
6,t5304:
avoid clock skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mich
a
el J Grube
r
git
.
txt:
f
ix
list continuation
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 Hama
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'jc
/
r
ev-list-opti
o
ns-
f
ix' i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge branc
h
'js/
c
h
e
ckou
t
-untracked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
o
nathon
M
ah
mergetool: Teach about s
u
bmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Me
y
er
i
ng
r
e
move double
d
words, e
.
g
.
, s/t
o
to/to/, and
f
ix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
R
amkumar Ramachandra
rev
e
rt: Hide '-
r
' opt
i
on in default usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
C
arlos Martín Ni
e
to
format-patc
h
: document --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
Ma
r
t
ín Nieto
format-patch: don't pass
on the -
-
quiet flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Herland
--
d
irstat: In case of re
n
ames, use tar
g
et fil
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge br
a
nch '
j
s/check
o
ut-untracked-sy
m
link'
commit
|
commitdiff
|
tree
2011-04-12
J
unio C
H
amano
Merge branc
h
'nd/init-g
i
tdi
r
'
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
nes Sixt
t2021: ma
r
k a test as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t0001
:
guard a
new test with SYMLINKS prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han H
e
rlan
d
Teach --dirstat not to com
p
letely
i
g
n
or
e
rearrange
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Ar
n
f
j
örð
B
j
a
rmas
o
n
Makefile: extract Q_(
)
sour
c
e
string
s
as ngettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay
J
o
nes
i18n: avo
i
d
p
arent
h
esized
stri
n
g as arra
y
i
n
i
t
ial
i
zer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Her
l
and
--d
i
rstat-by-file: Make i
t
faster
and
more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
a
n
He
r
lan
d
--dirs
t
at: Describe no
n
-obvious differences relative
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge gi
t
://git
.
bogomips
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
M
erge g
i
t:/
/
g
i
t
.
kern
e
l
.
org/p
u
b/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash:
e
nsure --
n
o-keep-index and --p
a
tch
can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
s
t
ash: add tw
o
more t
e
sts
for -
-
no-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git
-
p4: replace each tab with 8
spaces for cons
i
stency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
e
f
f
King
upload-
p
ack: s
t
art pack-ob
j
ects before async r
e
v
-
l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
Gi
t
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Mer
g
e
branch 'nm/m
a
in
t
-conf
l
icted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge bran
c
h '
m
g/rev-list-n-rev
e
r
se-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio
C
Hamano
Merge
b
ranch 'jk/maint-remote
-
mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Haman
o
Merg
e
branch
'
m
g/doc-revisions-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
stas
h
: drop dirty worktre
e
check on apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach core
.
big
f
ilet
h
reashold t
o
pack-object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next