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 'jk/color-diff-plain-is-context'
2015-06-11
Jun
i
o C Hamano
Merge branch 'jk/color-
d
iff-plain-i
s
-c
o
ntext'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
no
Merge branc
h
'jk/
c
lone-diss
o
cia
t
e
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch
'
jc/diff-ws-error-high
l
igh
t
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Sync w
i
th 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C
Hamano
Git
2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
The first half
o
f the
seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hama
n
o
Merge bra
n
c
h
'
l
d
/p4
-
editor-m
u
lti-wo
r
d
s
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge br
a
nch 'bc/
o
bject-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
Mer
g
e br
a
nch
'jk/at-push-
s
ha1'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ham
a
no
Me
r
ge bran
c
h
'
dl/branch-error-message' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge bra
n
ch 'jk/skip-h
t
t
p
-tests-
u
nder-no-
c
u
rl
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
a
no
M
e
rge br
a
n
c
h 'ps
/
doc-packfile-vs-pa
c
k-file'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
er
g
e br
a
nc
h
'fg/document-commit-message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e bran
c
h 'jk/re
r
ere-for
g
et-check-enable
d
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
ama
n
o
Merge branch 'pt/pull-log-n' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge
b
ranch 'pt/pull-ff-vs
-
merge-ff' in
t
o main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Haman
o
Merge branch 'rs/plug-
l
e
ak-in-pac
k
-bitmaps' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bra
n
ch 'ja/tutorial-asciidoc
t
or-fix'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bra
n
c
h
'jk/stripspace-asciidoctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
H
amano
Merge branch
'
jk/asciidoc
-
markup-fix' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
e
r
ge
b
r
a
nch
'
ps/bundle-verify-ar
g
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bran
c
h 'mh/write-refs-
s
oone
r
-2
.
4' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e bran
c
h
'mh/ref
-
directo
r
y
-
f
ile'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'mg/log-decorate-HEAD' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge
b
ranch 'sb/t1020
-
cleanup' i
n
to
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
r
anch 'jc/gitign
o
re-prec
e
dence
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
b
r
anch 'bc/connect-plink
'
int
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o C Ha
m
ano
Merge branch 'p
h
/re
b
a
s
e-i-redo' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'jk/add
-
e-kill-editor' in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
Merge bran
c
h 'mh/
c
lone-verbosity-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'j
k
/s
h
a1-fil
e
-reduce-
u
seless-war
n
i
n
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
e
r
g
e branch 't
b
/blame-res
u
rrect
-
convert-to-git
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'jc/plug-f
m
t-merge-msg-leak' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
amano
M
erge branch 'p
t
/xdg-config-pa
t
h' into maint
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C
Hamano
Sixth batch
for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nc
h
'sb/tes
t
-bi
t
map-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge
b
ra
n
c
h 'mm/r
e
base-i-post-rewrit
e
-exec
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
branch 'fm
/
fetch-raw-
s
h
a1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Ham
a
n
o
M
e
rge branch 'sg/help
-
g
r
oup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge b
r
anch 'mm/lo
g
-format-raw-do
c
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C
H
a
mano
Merge
b
ranch 'dt/cat-file-f
o
llow-sy
m
l
i
nks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge bra
n
ch 'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
mano
Merge br
a
nch 'jk/stash-optio
n
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch
'
da/me
r
get
o
ol-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge branch
'mc
/
commit-d
o
c
-
gram
m
ofix'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge
bra
n
ch
'
j
h/fi
l
ter-
e
mp
t
y
-
contents'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C
H
aman
o
Merge branch 'ah/usage
-
stri
n
gs'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io
C
Hamano
Merge
b
r
a
n
ch 'jk/h
t
tp-backend-deadl
o
c
k
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Ham
a
no
M
e
rge branch 'dt/clean-pathspec-filter-then-lst
a
t'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h:
r
e
name DIFF_
P
LAIN
c
ol
o
r slot to DIFF_C
O
NTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: acce
p
t color
.
di
f
f
.
context as a sy
n
o
nym for "p
l
ain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C Ha
m
ano
M
erge branch 'nd/
u
ntracke
d
-c
a
c
he'
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f
K
ing
t7063: h
i
de st
d
err from setup inside prere
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
clone: reorder
-
-di
s
sociate and --reference options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone:
u
s
e OPT
_
STRIN
G
_LIST for --reference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Ha
m
ano
diff
.
c: --ws-error
-
hi
g
hlight=<ki
n
d
> optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Haman
o
diff
.
c: add emit
_
del_line() and emit_con
t
ext_line
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C H
a
mano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Gi
t
2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge branch 'jk
/
sti
l
l-in
t
e
r
estin
g
' into maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
M
e
rge b
r
anch
'
jc/hash-object' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
ranch 'jk/re
b
ase-quiet-n
o
op' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Merge br
a
nch 'sg/complete-d
e
corate-full
-
not-lo
n
g' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ham
a
no
Merge
branch 'jk/fi
l
ter-br
a
nch
-
use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jc/daemon-no-i
p
v6-for
-
2
.
4
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hama
n
o
Merge branch
'jk
/
stash-require-clean-i
n
dex' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C Ham
a
no
Merge bra
n
ch
'
j
k/git-
n
o
-
m
o
re-argv0-
p
a
t
h-munging
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Fifth batch f
o
r 2
.
5 cycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
H
amano
Mer
g
e branch 'nd/untracke
d
-ca
c
h
e
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
er
g
e b
r
anch 'rs/plug-leak-
i
n-pack-bi
t
m
ap
s
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge bra
n
ch 'pt/
p
ull-ff-vs-merge-f
f
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h '
p
t/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
a
m
a
n
o
M
e
rge branch '
j
k/rerere-forget-ch
e
c
k
-e
n
abled'
commit
|
commitdiff
|
tree
2015-05-26
L
u
ke Diama
n
d
git-p4: test
s
: use
test-chmt
i
me
in place of to
u
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
t4
0
15: separate
co
m
mon setup and
per-test
expectatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C Hamano
t4
0
15: mode
r
nis
e
s
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C
H
ama
n
o
Merge
b
ran
c
h '
j
k/
h
ttp-backend-
d
ea
d
l
o
ck-2
.
3' i
n
t
o
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Me
r
ge b
r
anch '
j
k/http-bac
k
e
n
d-deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Je
f
f
Kin
g
ht
t
p-backend: s
p
ool ref neg
o
tia
t
ion re
q
uests to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
st
r
uct ref
_
lock: con
v
ert old_s
h
a
1 me
m
be
r
to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Ha
g
ge
r
ty
war
n
_if_dangling_symref(): conv
e
rt l
o
c
al variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
e
a
ch
_
ref_fn_adapte
r
()
:
remove
a
dap
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
Haggerty
r
ev_l
i
s
t
_
i
n
sert_ref
(
): remove unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
rev_list_i
n
s
e
r
t
_ref_o
i
d
(
): new function, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Ha
g
gerty
mark_complete():
remove un
n
eeded ar
g
u
men
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
mark_complete_
o
id(): new
f
un
c
tion, taking
an object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
cl
e
ar_
m
arks():
re
w
rite to take a
n
obje
c
t_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_comp
l
ete(): rewri
t
e to take
an object_id ar
g
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
cha
e
l Haggerty
send_r
e
f(): convert local variable
"
p
e
e
l
ed" to ob
j
ect_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
upload-pack: rew
r
ite functions to take object_id
a
rguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
fin
d
_
s
ymref():
c
o
nvert local v
a
riable "unused" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggert
y
find_symref(): re
w
rite to take
a
n
o
b
ject_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
write_on
e
_ref(): rewrite t
o
take an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
wr
i
te_refs_to_temp_di
r
(): convert
loca
l
v
a
riable s
h
a1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
ha
e
l Hagg
e
rty
subm
o
dule:
rewrite to take an object_id argu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hagge
r
ty
shallow: rewrite functions to take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggerty
handle_one_ref(): r
e
write to take an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hagg
e
rty
add_i
n
fo_ref
(
): rewrite to take an object_id argumen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
handle_one_reflog(): rewrit
e
to take
an obje
c
t_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
re
g
ister_repla
c
e_ref
(
)
:
rewr
i
te to take
an object
_
id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next