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
t6036: criss-cross with weird content can fool git into clean merge
2011-05-13
Ju
n
io C
H
a
mano
Merge
branch 'gr/cvsimp
o
rt-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merg
e
b
ranch 'cj
/
p4merge'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge br
a
nch 'j
k
/merge-one-file-working-
t
ree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge
b
ranch
'jc/fix-diff-files-u
n
merged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge
bra
n
ch
'
m
z
/maint-renam
e
-unmerge
d
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Johan
Her
l
and
t5400: F
i
x a c
o
u
p
le of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge branch
'
jc/maint
-
1
.
7
.
4-pathspec-stdin-and-c
m
dline
'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hama
n
o
Me
r
ge branc
h
'jc/ma
i
nt
-
1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
setup_revisions(): take
paths
p
ec from co
m
m
and line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Con
t
r
e
r
a
s
git-c
o
m
p
le
t
i
o
n
:
f
i
x regression in zsh support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jo
h
anne
s
Sixt
Ho
n
or $(prefix) set
in confi
g
.
mak* when defin
i
ng ETC_GI
T
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io
C
H
a
mano
Re
v
ert "Honor $(
p
refix) set in
config
.
mak* when
defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
a
mano
t1507:
a
void "${parameter<op>'word
'
}" ins
i
de
doubl
e
.
.
.
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 last
t
est
to
p
as
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
r
eb
s
ki
Remove gitweb/gitweb
.
cgi an
d
other legacy tar
g
ets 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
git-instaw
e
b:
Simplify build dependency on gitw
e
b
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: m
a
ke
b
ranch
.
<name>
.
mergeoptions correc
t
l
y
override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
R
e
m
o
v
e
duplicated "is
a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fast-
i
mport: fi
x
option parser for no-arg o
p
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
M
e
rge
br
a
nch 'j
s
/main
t
-1
.
6
.
6-send-pack-st
a
tele
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jef
f
King
send-pac
k
:
u
nbreak push over
s
tat
e
less rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
V
alentin Haenel
git-reset
.
t
x
t: better docs for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haen
e
l
git-checkout
.
t
x
t: better do
c
s for
'
--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Val
e
n
tin Haenel
git-stash
.
t
x
t: better docs
for '-
-
p
a
tch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valen
t
i
n
Hae
n
el
git-ad
d
.
txt: document
'interactive
.
si
n
glekey'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haene
l
conf
i
g
.
txt: 'interactive
.
singlekey;
i
s used by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701:
fix here do
c
umen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J G
r
uber
git-fa
s
t-import
.
txt
:
--relative-ma
r
ks takes no parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharo
v
s
hell: add
missing
i
n
i
tiali
z
a
tion of argv0_
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Bria
n
Gernhardt
t/annotate-tests: Use
echo &
cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
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
Merg
e
branch 'jh/di
r
stat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge branch 'sp/maint-clear-postfields' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Haman
o
Merge branch 'jk/maint-stash-oob' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Mer
g
e
branch
'jk/
m
a
i
n
t
-
upload-p
a
ck-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'dm/stash-k-i-
p
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Me
r
ge branch 'jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
Ham
a
no
Mer
g
e
b
ranc
h
'mg/reflog-wi
t
h-options'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/stash-l
o
osen-safety' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge
b
ranch 'ar/clean-rmdir-empty' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge branch 'mg/sha1-p
a
th-advis
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin Haenel
git-a
d
d
.
txt: docume
n
t 'add
.
ignoreEr
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
Ciara
n
J
essup
Pass empty file to p4mer
g
e whe
r
e no
base i
s
suitab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Ro
u
illie
r
Lo
o
k for pas
s
word in both
C
VS and CVSNT pass
w
ord fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-fi
l
e: fix brok
e
n
merges
w
ith alternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
add tests for merge-index /
m
erge-one
-
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"a
d
d -p":
w
ork-aro
u
nd an old l
a
ziness that
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
un
i
o C Hama
n
o
a
dd--inter
a
ct
i
v
e
.
perl
:
fact
o
r
o
ut repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
t3701: Editi
n
g
a split h
u
n
k in
a
n "add -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
add -p
:
'q' shoul
d
really q
u
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C
Hamano
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch 'mg/x
-
y
ears-12-mont
h
s'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
Sy
l
v
a
in Rabot
git-
s
end-email: fi
x
missing space in
e
r
r
or
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jos
h
Stone
blame: tolerate bog
u
s e-mail
addresses
a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Kacper Kornet
H
o
no
r
$(pre
f
ix) se
t
i
n
c
onfi
g
.
mak*
when defi
n
i
ng ETC_GIT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wo
n
g
gi
t
-rebas
e
--interactive
.
s
h
:
p
reserve-mer
g
e
s
fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Michael J Gruber
con
f
ig
.
txt,diff-options
.
t
x
t: po
r
celain vs
.
plumbing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: q
u
o
te rfc8
2
2
s
pecia
l
s in
email
a
ddre
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Fraser Twe
e
dale
gitwe
b
:
supp
l
y
'-
n
'
to gzip for identical output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
a
enel
git-svn
.
txt:
s
mall typeface
improvemen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: move
opt
i
on
descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: fix usage
o
f -
-
add-author-
f
rom
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Mathias Lafeldt
t/README: unify documentation of
t
e
st
f
un
c
ti
o
n args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C H
a
mano
http: c
l
e
a
r POSTFIELDS when
i
n
itiali
z
ing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
J
u
nio C
H
amano
M
erge branch 'js
/
maint-1
.
6
.
6-send-pack-
s
tateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Joha
n
nes Sixt
send-pack: avoid deadlock wh
e
n
p
ack-o
b
ject dies ea
r
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
G
i
t 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
Ha
m
ano
Fix "ad
d
-
u" that
s
omet
i
m
es fails to resolv
e
unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
diff-fi
l
es: sh
o
w unmerged entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
diff: remove
o
ften unused p
a
r
a
m
eters from di
f
f_unm
e
rg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
Hamano
diff
.
c
: return
f
i
lepair fro
m
diff_
u
n
m
erge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
test: use $_z40 from test-
l
ib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Grube
r
d
ate: avoi
d
"X years, 12 months" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan
Nieder
run-
c
o
mman
d
: handle sh
o
rt writes and
EINTR in
d
ie_c
h
ild
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan N
i
eder
tests: check
error message from run_
c
o
mman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Ha
m
a
no
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 Ham
a
no
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
S
tefan Spe
r
li
n
g
re
m
ove noise and inac
c
uracies
from
g
it-svn do
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jo
h
an
n
es Sixt
Documen
t
ation/format-patch:
suggest Toggle Word
W
rap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-svn
.
txt:
D
oc
u
ment --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C
H
amano
Rev
e
rt "ru
n
-com
m
and: prettify -D_F
O
RTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian Schuberth
doc: Clar
i
fy that "cherry-pi
c
k -
x
" does not
use
"
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jo
n
athan Nie
d
er
Documentation: publicize hints
f
o
r
sending patches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
onathan Nieder
Documentatio
n
: public
i
z
e
K
M
ail hints for sending
patches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jon
a
than Nieder
Docu
m
entation: hints fo
r
sendin
g
patches inline w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Documentation: explain how to check for patc
h
cor
r
uption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Junio
C Haman
o
Me
r
ge v1
.
7
.
5
-
rc2 into jn/forma
t
-patch-doc
commit
|
commitdiff
|
tree
2011-04-15
Jona
t
han N
i
ed
e
r
Docum
e
ntat
i
on: describ
e
the form
a
t 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
Jonathan Nied
e
r
Restructure
d
o
cum
e
ntation for git-merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
V
incent van Ravesteijn
Documentat
i
on: up
d
a
t
e t
o
git
-
me
r
g
e
-
b
a
s
e --octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
i1
8
n
:
use
t
e
st
_
i1
8
n{cmp,g
r
ep} in t7
6
00,
t
7607
,
t
761
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ha
m
a
no
i18n: use test_i18n{grep,c
m
p} in t7508
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
amano
i18n
:
use tes
t
_i18ngre
p
in t750
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Ju
n
io C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René
Scharfe
archive: do
c
ument
li
m
itation of tar
.
u
mask
c
onfig setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t5304: a
v
oid clock
s
k
e
w issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael
J Gru
b
er
g
it
.
txt:
fix
l
i
st continuat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
i18n: us
e
test_i18ngr
e
p and te
s
t_i18ncmp
i
n t75
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
i18n: use test_i18ngrep in t750
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next