repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-08
Junio C Hamano
Merge branch 'cl
/
p4-us
e
-diff-tre
e
'
i
nto maint
commit
|
commitdiff
|
tree
2014-05-08
J
un
i
o
C
H
amano
Merge br
a
nc
h
'rh/pro
m
pt-p
c
mode-avoid-
e
val-on-refna
m
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
J
u
n
io C Hamano
Merge
bra
n
ch 'km/avoid
-
non-
f
unction-
r
et
u
rn-in-rebase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
J
unio C Ham
a
n
o
Merge branch 'tb/unicode-6
.
3-ze
r
o-wid
t
h' in
t
o main
t
commit
|
commitdiff
|
tree
2014-05-08
Junio C H
a
m
an
o
Merge branc
h
'km/avoi
d
-
bs-in-sh
e
ll-glob' into
m
aint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge branch 'km
/
avoid-cp-a' into main
t
commit
|
commitdiff
|
tree
2014-05-07
Tolga Ceylan
git-p4: form
a
t-patch to diff-tr
e
e change break
s
bi
n
ary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-22
Ri
c
h
a
r
d Hansen
git
-
p
rompt
.
sh: don't put u
n
sanitize
d
bra
n
ch names in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-17
Kyle
J
.
McK
a
y
Revert "rebase: fix run_specific_
r
eba
s
e's use of "
r
eturn
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-17
K
yle J
.
McKay
r
e
b
ase: avoid
no
n
-function use of "return" on FreeB
S
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-11
Kyle J
.
M
c
K
ay
test: fix t556
0
on FreeB
S
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-11
Kyle J
.
M
c
Ka
y
test: fix t7001 cp t
o
use POSIX op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-09
Jun
i
o C Hamano
Git
1
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Merge branch '
j
l/nor-or-
n
and-and' in
t
o maint
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Merge branch
'cn/fetch-prun
e
-overl
a
pping-destination
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Junio C Haman
o
Merge bran
c
h '
m
h/update-ref-batch-create-fix' into
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
J
unio C
H
a
mano
Merge branch 'jk/com
m
it-dat
e
s-pars
i
n
g
-fix' into maint
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Me
r
ge
branch 'jc/f
i
x
-diff-no
-
inde
x
-diff-opt-parse'
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Ju
n
i
o
C Hama
n
o
Merge comm
i
t
'
doc/
h
t
t
p
-
backen
d
:
missin
g
acce
n
t gra
v
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Thom
a
s Ackermann
doc
/
http-backend: mis
s
ing accent grave
i
n
literal mark-
u
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-09
Torsten Böge
r
shause
n
utf8
.
c:
partially upd
a
te to version
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-08
J
unio C Hamano
Update dra
f
t release notes to
1
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-08
Junio C H
a
mano
Merge branc
h
'mm/status
-
porcela
i
n-format-i1
8
n-fix'
.
.
.
commit
|
commitdiff
|
tree
2014-04-08
Ju
n
io C
H
amano
M
e
r
ge branch 'bp/commit-p-edi
t
or' into maint
commit
|
commitdiff
|
tree
2014-04-03
Jun
i
o C Haman
o
Start preparing for 1
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-03
J
u
nio
C Hamano
M
e
rge branch 'jk/mv-submodules-
f
ix' into maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
Merge br
a
n
c
h 'mh/
r
emove-subtree-long-pathname-fi
x
'
.
.
.
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
M
erge branch '
j
k/lib-terminal-lazy' into
main
t
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
Merge branch 'nd
/
index
-
p
ack-error
-
message' into
maint
commit
|
commitdiff
|
tree
2014-04-03
Junio
C Hama
n
o
Merge branch 'us/printf-not-echo' into mai
n
t
commit
|
commitdiff
|
tree
2014-04-03
Jun
i
o C Hamano
Merge branch 'rr/doc-merge-st
r
ate
g
ies'
i
nto maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
Merg
e
br
a
nch 'jk/shallow-update-fix' into maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
Merge bra
n
ch 'jc/stash-pop-n
o
t-popped' in
t
o
m
aint
commit
|
commitdiff
|
tree
2014-04-03
Junio C Haman
o
Merg
e
branch
'jn/wt-
s
tat
u
s
' into
m
aint
commit
|
commitdiff
|
tree
2014-04-02
A
m
an
Gupta
update-ref: fa
i
l crea
t
e operation over stdi
n
if
r
ef
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-01
J
eff King
t4212:
l
oo
s
en far-
i
n-f
u
tu
r
e
test fo
r
AIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-01
Jeff King
d
ate: recogniz
e
b
ogus
FreeBSD
g
mtime outpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-31
Ju
s
tin Lebar
cod
e
a
n
d
t
e
s
t:
f
ix misus
e
s of "nor"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-31
Ju
s
tin Lebar
com
m
e
n
ts: fix misuses of "
n
or"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-31
Justin Le
b
ar
con
t
rib: fix
m
isuses of
"nor
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-31
J
ust
i
n Leb
a
r
Doc
u
mentatio
n
:
f
ix misuses of
"
nor"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-31
Jun
i
o
C
H
amano
diff-no-index: correc
t
ly d
i
agnose
error
r
eturn f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-26
Carlo
s
Martín Nie
t
o
fetch
:
h
a
nd
l
e overlaping refspecs on --prune
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-26
Matthieu Moy
status:
disable t
r
a
n
s
l
ati
o
n when --porcel
a
in is used
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
G
i
t 1
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge branch 'jk/clean-d-
p
a
ths
p
ec' into maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
M
e
rge
b
ran
c
h 'd
a
/d
i
ff
t
ool-
g
it-files'
int
o
maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
M
er
g
e branch 'jk/remote-pushremote-confi
g
-reading'
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C
Hamano
Merge branch 'jk/commi
t
-dates-parsin
g
-fix' into maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C
H
amano
M
e
rge branc
h
'tr/diff-submodule-no-reu
s
e
-
worktree
'
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge br
a
n
ch 'nd/reset-
s
etup-workt
r
ee' into maint
commit
|
commitdiff
|
tree
2014-03-18
Juni
o
C Hama
n
o
Merge branch 'jc
/
ch
e
ck-a
t
tr-honor-working-tree'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C Ha
m
a
no
Me
r
g
e branch 'b
k
/refresh-missin
g
-ok-in-merge-recursive
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C Haman
o
Merge
branch 'ds/rev-parse-r
e
quired-ar
g
s
' into
m
a
int
commit
|
commitdiff
|
tree
2014-03-18
Junio C H
a
mano
Mer
g
e branch
'
jk/con
f
i
g-path-i
n
clude-fix' into maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge branch '
n
d/diff-qui
e
t
-
s
tat-dirty
'
i
n
to maint
commit
|
commitdiff
|
tree
2014-03-18
Junio
C
Ham
a
no
Merge branch 'nd/
h
ttp
-
f
e
tch-shallow-fix
'
into
m
ain
t
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Mer
g
e
b
ranch 'nd/submodule-pa
t
h
spe
c
-ending-with-slash
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
U
w
e Stor
b
e
c
k
tes
t
-
lib
.
sh: do not "echo"
caller-su
p
plied st
r
in
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
B
e
noit Pierre
r
u
n-comma
n
d: mark run_
h
ook_with_custom_ind
e
x as de
p
recated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
B
enoit Pierre
merge hook tests: fix and update te
s
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
Be
n
oit P
i
err
e
merg
e
:
fix GI
T
_EDITOR over
r
ide
f
or commit ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
B
enoit Pierre
commi
t
: fix
p
atch hunk editing with "co
m
mit -p
-m"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-18
B
e
noit
P
ier
r
e
te
s
t patc
h
hun
k
ed
i
ting wi
t
h "commi
t
-p -m"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-17
R
a
m
k
umar Ra
m
ach
a
ndr
a
D
o
cum
e
ntatio
n
/merge-strat
e
g
ies: avoid hyphe
n
ated co
m
mand
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-17
J
u
nio
C Ha
m
ano
index-pack: r
e
port error using the co
r
r
e
ct variab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-17
Jeff
K
ing
sh
a
llow: verify shallow file afte
r
ta
k
ing lo
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-17
Uwe
S
t
o
rbeck
rebase -i: do not "echo" r
a
ndo
m
user-supplied strin
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-17
brian
m
.
carlson
mv: prevent mismatch
e
d data when ignoring errors
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-14
Jef
f
K
ing
t/lib-t
e
r
mi
n
al: mak
e
T
TY a lazy
p
r
e
requisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-13
M
i
c
hael
H
agg
e
rty
entry
.
c: fix possi
b
l
e buffe
r
o
ve
r
flow i
n
remove_
s
u
btree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-13
Micha
e
l
H
aggerty
checkou
t
_
e
n
t
r
y(): use the strbuf
throug
h
out
the
f
unc
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-12
Junio C
H
a
mano
wt-st
a
tus: l
i
f
t
the
a
rt
i
ficual
"a
t
l
e
ast 20 col
u
mn
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-12
Jo
n
a
t
han Nieder
wt-status:
i
18n of
s
ection
l
abels
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-12
Jon
a
tha
n
Nied
e
r
wt-statu
s
: ext
r
act t
h
e code to compute width f
o
r
labels
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-12
Junio C
H
amano
wt-s
t
a
t
u
s: make full labe
l
string
to be subject to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-11
J
o
hn
K
ee
p
ing
builtin/mv: fix ou
t
o
f
bounds write
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-11
Be
n
oit Pierre
merge
hook tests: use '
t
e
st_must_
f
ail' instea
d
of
'!'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-11
Benoit Pie
r
re
merge h
o
ok tests: fix missing '&&' i
n
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-11
Jeff King
clean: simplify dir/not-dir l
o
gi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-11
Jeff King
cl
e
an: respect
paths
p
ecs with "
-
d"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-07
Jef
f
King
show_
i
den
t
_date:
f
ix tz
r
a
nge c
h
eck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-03-05
Junio C Haman
o
t
7800: add a difftool te
s
t for
.
git-f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-28
Carlos Martín Nieto
f
e
tch: add a f
a
il
i
ng
test for prunning with
overlapping
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-27
J
eff
King
s
h
allow: au
t
oma
t
i
c
ally clean up sha
l
lo
w
tem
p
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-27
Jeff
K
i
ng
shallow: u
s
e
stat_validity to check for up-to-date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-26
Junio
C
Hamano
st
a
sh pop: mentio
n
w
e did not drop
the stash upo
n
fa
i
ling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
N
g
u
yễn Thái
Ngọc
Du
y
di
f
f: do not
q
uit earl
y
on stat-dirty
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Ng
u
yễ
n
Thái Ng
ọ
c Duy
diff
.
c: move diffcore_s
k
ip_stat_unmatch cor
e
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn Th
á
i Ngọc Duy
clean: use cache_name_is_o
t
he
r
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Ngu
y
ễn Thái Ngọc Du
y
clean:
replace ma
t
ch_pathspec(
)
with d
i
r_path_
m
atch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn Thái Ngọc
Duy
pathspec: pass dir
e
ctory indicator to match_pathspec_item()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn Thá
i
Ngọc D
u
y
ma
t
c
h_pa
t
hs
p
ec: matc
h
pathspec "foo/" against directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Ng
u
y
ễ
n Thái Ngọc
D
u
y
dir
.
c: prepare match_path
s
p
e
c_item fo
r
ta
k
ing mor
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn T
h
ái Ngọc D
u
y
pathspec: r
e
name m
a
t
ch_pathspec
_
dep
t
h() to match_pathspec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn Thái
N
gọc Duy
pathspec: convert some
m
atch_pathspec_depth() to
d
ir_path_ma
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
N
guyễn Thái
N
gọ
c
D
uy
pathspe
c
: co
n
v
ert some match_
p
aths
p
e
c
_depth() to ce_path_match()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Brad
K
in
g
merge-recursive
.
c:
t
o
l
er
a
te missing file
s
w
h
ile
refreshing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
B
rad King
read-cache
.
c:
extend make_cache_ent
r
y
r
e
f
resh flag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-02-24
Brad K
i
ng
read-cache
.
c
:
ref
a
ctor
-
-ignore-missing im
p
l
ementation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next