repo.or.cz
/
git
/
mingw
/
4msysgit
/
gitPS1fix.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
read_sha1_file(): allow selective bypassing of replacement mechanism
2011-05-15
Junio C Ham
a
no
r
e
ad_s
h
a1_file
(
): allow sel
e
c
t
ive bypassing of replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
i
n
lin
e
lookup_replace_obje
c
t() calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o C Ham
a
n
o
read_sha
1
_file(): get rid of r
e
ad_
s
ha1
_
file_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
an
o
t6050: make sur
e
we test not ju
s
t commit re
p
l
a
cement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Declare
looku
p
_replace_object(
)
in cache
.
h, not in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
am
a
no
Up
d
ate draft release no
t
e
s
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
ano
Merge branc
h
'jn/run-command
-
error-failure'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ham
a
no
Me
r
ge branch 'js/in
f
o
-ma
n
-
path
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C
Hamano
Merg
e
branch
'im
/
hashcmp-op
t
im'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o
C H
a
man
o
Merg
e
b
r
anch '
j
k/m
e
rg
e
-o
n
e-f
i
le-wo
r
k
ing-tree'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
M
e
rge branch 'jc/fix-diff-files-u
n
merg
e
d'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Me
r
ge branch
'cj/p4
m
er
g
e'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hama
n
o
M
erge branch 'gr/
c
vsi
m
po
r
t-al
t
ernat
i
ve
-
cvspass-location'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Haman
o
Merge branch
's
g
/completion-c
l
eanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'
js/blame-pars
e
name
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Me
r
ge branc
h
'jk/format-patch-quote-speci
a
l-in
-
from'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ha
m
ano
M
e
rge
branch '
n
d/str
u
ct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'aw
/
m
a
int-rebase-i-p-no
-
ff'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ham
a
no
M
er
g
e bra
n
ch 'mg/al
i
as-expos
e
-prefix'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branch
'
m
g/
d
iff-u
i
config-d
o
c'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o C Hama
n
o
Merge branc
h
'
m
a
int
'
commit
|
commitdiff
|
tree
2011-05-06
João B
r
i
t
to
Remov
e
duplicated
"
is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Ha
m
ano
t3701: fi
x
h
e
re
d
o
cum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mic
h
ael J Gruber
git-
f
ast-import
.
txt: --relative-mar
k
s takes no param
e
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell
:
add m
i
ss
i
ng i
n
itia
l
ization of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ger
n
ha
r
dt
t
/a
n
n
o
tate-tests: Use e
c
ho
&
cat in
s
tead of
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Upd
a
t
e d
r
aft release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ml/test-rea
d
me'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'ft/gitweb-tar-with-gz
i
p-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
br
a
nch
'
m
g
/rev-list-count-c
h
erry'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merg
e
branch 'ss/d
o
c-svn'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
Hamano
Merge br
a
nch 'jn
/
format-p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch '
v
r/merge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
rge branch 'ss/cher
r
y-pick-
x
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jn/
m
aint-format-p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/format-patch-multiline-header'
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
M
e
r
g
e b
r
anch
'
jm/mergetool-submodules'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
S
y
nc with 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hama
n
o
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
ano
Merge branch
'
jh
/
d
i
r
s
tat' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge b
r
anc
h
'sp/maint-clear-postfields
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
a
m
a
no
Mer
g
e branc
h
'
j
k/maint
-
s
t
as
h
-oob
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jk/maint-upload-pack-
s
hallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
Hamano
M
erge branch 'dm/sta
s
h-k-
i
-p
'
int
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
e
rge branch 'jc/pack-objects-big
f
ile'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch '
m
g/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Ham
a
no
Merge branch 'jk/stas
h
-loosen
-
safety'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Merg
e
branch 'ar
/
clean-r
m
dir-empty
'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
e
rge branc
h
'mg/sha1-path-advise' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
V
alentin Haen
e
l
git-
a
d
d
.
tx
t
: document
'
add
.
ign
o
reErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
J
unio C
H
amano
Upda
t
e draft rel
e
as
e
n
o
t
es
t
o
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Hamano
M
e
rge branch 'jk/notes-
u
i
-updates'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Haman
o
Merge branch 'ab/
i
18
n
-fixup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge branch '
n
m
/su
b
modu
l
e-updat
e
-forc
e
'
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Hamano
Merge branch 'jh/notes-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
i
o C Hamano
Merge
b
ranch
'
n
d/mai
n
t-setup'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
io C Hamano
M
e
rge branch 'mz/maint
-
rename-u
n
m
erged
'
commit
|
commitdiff
|
tree
2011-05-02
Jonathan Nied
e
r
D
o
c
u
m
e
n
t
a
ti
o
n: clarify meaning of
-
-html-
p
ath, --man
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jon Se
y
mour
git: add --in
f
o-path and --man-
p
a
t
h opti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Up
d
a
t
e draft release notes t
o
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ju
n
io C Hama
n
o
Merg
e
branc
h
'r
s
/strbuf-setlen-a
s
sert'
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Merge bran
c
h 'vh/git-sv
n
-
doc'
commit
|
commitdiff
|
tree
2011-05-01
C
i
a
ran Jessup
Pas
s
empty file to p4merge where no base is
suitab
l
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for password in both CVS and CVSNT p
a
sswo
r
d fil
e
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge
-
one
-
file: fix bro
k
en merges with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
ing
add tests
for merge-index / merge-one-f
i
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
S
tart
1
.
7
.
5
.
1
ma
i
nt
e
nance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Merge branch 'mg
/
x-years-12-months' int
o
main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
a
b
ot
git-send-emai
l
: fix missing sp
a
ce in error me
s
s
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tol
e
rate bogus e-
m
ai
l
add
r
e
s
ses
a
bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
M
athias Lafeldt
t/test-lib
.
sh:
m
in
o
r
rea
d
ability improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
i
m Mey
e
ring
di
f
fcore-rename
.
c: avoid set-but-no
t
-use
d
war
n
in
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Junio
C
Ham
a
no
Merge br
a
nch 'jc/diff-ir
r
eversible-delete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C
H
amano
Merge br
a
nch 'jc/ren
a
me-deg
r
ade-
c
c-to-c'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Merge branch 'mz
/
rebase'
commit
|
commitdiff
|
tree
2011-04-28
J
u
nio C Hamano
M
e
r
g
e
branch 'en/mer
g
e-recursi
v
e'
commit
|
commitdiff
|
tree
2011-04-28
Junio C
H
amano
Merge
b
r
anch 'jh
/
dirstat'
commit
|
commitdiff
|
tree
2011-04-28
Junio C
Hama
n
o
Merge bran
c
h 'sp/maint-clea
r
-p
o
st
f
ie
l
d
s'
commit
|
commitdiff
|
tree
2011-04-28
In
g
o Molnar
hashcmp
(
): inl
i
ne me
m
c
m
p
(
) by hand to optimi
z
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Won
g
g
it-rebase--intera
c
tive
.
sh: pres
e
rve-me
r
ges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
SZEDER Gábor
comp
l
etion: remove
unn
e
cessary _get_comp_words_b
y
_re
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
SZEDER G
á
bor
completio
n
: don't
m
o
dify the
$
cur
v
ariable i
n
completion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hama
n
o
Start
1
.
7
.
6
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
i
o C Ham
a
no
M
e
rg
e
branch 'mg/x-y
e
ars-
1
2-months'
commit
|
commitdiff
|
tree
2011-04-27
Junio C H
a
mano
Me
r
ge
b
ranch
'
cn/format-patch-quiet'
commit
|
commitdiff
|
tree
2011-04-27
J
unio C Hamano
M
e
rge branch 'ef
/
m
aint
-
s
t
rbuf
-
i
n
it'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge branch
'rr/doc-cont
e
n
t
-type'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge bran
c
h 'jc/merge-dash-pre
v
ious
'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o C
H
amano
Mer
g
e branch 'dm/sta
s
h-k-i-p'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C Hamano
Merge branch 'rj
/
sparse'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C Ham
a
no
M
erge branch 'jk/maint-u
p
load-pack-shallow'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Me
r
ge branch 'nk/bl
a
me-abbrev'
commit
|
commitdiff
|
tree
2011-04-27
J
uni
o
C
H
a
m
ano
Merge branch 'j
k
/
maint-st
a
sh-o
o
b
'
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C H
a
mano
Merge b
r
anch 'dm/c
o
lor-p
a
lett
e
'
commit
|
commitdiff
|
tree
2011-04-27
J
u
ni
o
C
Hamano
Merge
branch 'jk/stash-loosen-s
a
fety'
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
io C Hamano
M
erge branc
h
'
j
c/pack-ob
j
ects-big
f
ile'
commit
|
commitdiff
|
tree
2011-04-27
Junio
C
Hamano
Merge bra
n
ch
'mh/git-svn-au
t
omkdirs
'
commit
|
commitdiff
|
tree
2011-04-27
Junio
C Haman
o
Me
r
ge bran
c
h
'
mg/re
f
log-with-options
'
commit
|
commitdiff
|
tree
next