repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdiff: fix merging of hunks with -W context and -u context
2016-09-14
René Sch
a
r
f
e
xdi
f
f: fix me
r
ging of hunks with -W
c
ontext
a
nd -u
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-09
J
unio
C
Hamano
Prep
a
re for 2
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-09
Junio C Hamano
Merg
e
branch 'hv/do
c
-commit-ref
e
r
en
c
e-style' int
o
maint
commit
|
commitdiff
|
tree
2016-09-09
J
u
nio C H
a
mano
Merg
e
br
a
nch 's
g
/reflog-past-root'
int
o
m
aint
commit
|
commitdiff
|
tree
2016-09-09
Junio C Hamano
Merge
b
r
anch 'rs/mailinfo-lib' into maint
commit
|
commitdiff
|
tree
2016-09-09
Junio C Hamano
Merge branch 'jk/
t
ighten-al
l
o
c
' i
n
to maint
commit
|
commitdiff
|
tree
2016-09-09
Junio C H
a
mano
Merge br
a
n
ch 'r
s
/
u
s
e
-s
t
rbuf-add-unique-abbr
e
v
' into
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
J
u
ni
o
C Ha
m
an
o
Merge branch 'rs/merge-recursive-string-l
i
st-init'
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
J
unio C Haman
o
Merge branch
'
r
s/mer
g
e-add-stra
t
egies
-
simplificatio
n
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
J
u
nio
C
Hama
n
o
Merge branch 'ls/packet-line-
p
r
otocol-do
c
-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
Junio C H
a
mano
Merge branch 'bw/mingw-avoid-inher
i
t
i
ng-f
d
-to-l
o
ckfi
l
e
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
Juni
o
C Ham
a
no
M
e
rge b
r
anch 'dg/document-git-c-in-git-conf
i
g
-do
c
'
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
J
u
nio C
H
ama
n
o
M
e
rge bran
c
h
'js/n
o
-ht
m
l-by
p
ass-o
n
-w
i
ndo
w
s' into
m
aint
commit
|
commitdiff
|
tree
2016-09-09
Ju
n
io C Hamano
Merge branch 'jk/
d
ifftool-comm
a
nd-not
-
found' in
t
o m
a
int
commit
|
commitdiff
|
tree
2016-09-09
J
u
n
i
o C Hamano
M
e
rg
e
br
a
n
ch 'sb/chec
k
out
-
explit-det
a
ch-no
-
advice'
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
Junio C Hamano
Merge branch 'rs/pull-si
g
ned
-
t
a
g
' into maint
commit
|
commitdiff
|
tree
2016-09-09
Junio
C Hama
n
o
Merge
b
ranc
h
'
j
s/test-
l
i
nt-pathn
a
me' into maint
commit
|
commitdiff
|
tree
2016-09-09
J
u
nio C Ham
a
n
o
M
e
rge
b
ranch
'js/mv-dir-to-new-directory' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2016-09-09
Jun
i
o C H
a
mano
Merge branch
'js/
i
mport-tars-hard
l
in
k
s'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2016-09-09
Junio C Hamano
Merge
b
ranch 'ms/document-pack-window-memory-is-per
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
J
unio C Ham
a
no
Merge
b
ran
c
h 'jk/p
u
sh-f
o
rce-with-lease-creation' into
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
J
u
nio
C
Hama
n
o
Merg
e
b
ranch 'jk/r
e
flo
g
-
d
ate' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2016-09-09
Juni
o
C Hamano
Merge branch 'jc/
r
e
normalize
-
me
r
ge-kill-safe
r
-
c
rlf
.
.
.
commit
|
commitdiff
|
tree
2016-09-09
Jun
i
o C Ha
m
ano
Merge bra
n
ch 'jk/common-main'
int
o
maint
commit
|
commitdiff
|
tree
2016-08-30
Lars Schne
i
der
pack-pr
o
tocol: fi
x
maximu
m
pkt-line size
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-26
Beat Bolli
Submit
t
ingPatches: use gitk's
"
Copy commit
s
u
m
mary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-23
Dav
i
d Glasser
doc: menti
o
n
`gi
t
-
c` in git-
c
onf
i
g(
1
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-23
B
e
n
Wijen
mingw: ensure tempora
r
y
f
ile
handles are n
o
t
i
nherite
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-19
J
o
hannes Sch
i
nde
l
in
Revert
"
d
i
splay HTML in default b
r
owser using Windo
w
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-18
Be
n
Wijen
t6026-merge-attr: child processes mus
t
not inherit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-17
Heiko Voigt
SubmittingPatch
e
s: docum
e
nt how to refere
n
ce previous
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-16
Joh
a
n
n
es Sc
h
i
n
d
e
lin
t/Ma
k
efile: ensure
t
ha
t
paths are
valid on platforms
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-15
J
ohn K
e
eping
d
ifftool: always honor fatal error exit codes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-15
Stef
a
n B
e
ller
checkout
:
do not mention
d
etac
h
advice for expli
c
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-15
SZEDER G
á
bor
t1410:
remov
e
su
p
erfluous 'gi
t
reflog' fro
m
the
'
wa
l
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
René Scharfe
rece
i
ve-pac
k
: use FLE
X
_
A
LLOC_MEM in q
u
eue_command()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
René Scharfe
c
ommit: use FLEX_ARRAY in
str
u
ct merge_r
e
mote_
d
esc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
René Scharfe
m
e
rge-
r
ecu
r
sive: fix verbose
output
for multi
p
le base
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
Ren
é
Scharfe
c
o
mmit: factor out
s
e
t_merge_re
m
ote_desc
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
René Scharf
e
co
m
mit: use xstrdup() in
get_merge_parent()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
René Sch
a
rfe
mailinfo:
r
ecycl
e
str
b
uf in
c
he
c
k_header()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-14
René Scharf
e
c
orrect FLEXPT
R
_* example
i
n
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-12
Junio C Hamano
G
it 2
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-12
Jun
i
o C Ham
a
no
Merge b
r
anch 'jk/difftool-in-s
u
bdir' into
maint
commit
|
commitdiff
|
tree
2016-08-12
Junio
C
Hamano
Merge branch
'jk/reset-ident-tim
e
-per-commit' int
o
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
Ju
n
io C Hamano
Yet another b
a
tch for 2
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-10
Junio C Hamano
Merge bran
c
h
'jh/
c
l
ean-smudge-f-doc'
i
nto maint
commit
|
commitdiff
|
tree
2016-08-10
J
unio C Hama
n
o
M
e
rge bran
c
h '
r
s/use-strb
u
f
-
a
d
dstr' into ma
i
nt
commit
|
commitdiff
|
tree
2016-08-10
J
u
nio C Ha
m
ano
Merge
branch 'cp/comp
l
etion-
c
lone-recurse-submodul
e
s
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
Jun
i
o C Hamano
Merge
bra
n
ch 'jk/t420
5
-cl
e
an
u
p
' into maint
commit
|
commitdiff
|
tree
2016-08-10
Junio C Ha
m
ano
Merge
b
r
a
nch 'jc/h
a
s
h
m
a
p
-
d
oc-init' into maint
commit
|
commitdiff
|
tree
2016-08-10
Juni
o
C Hamano
Merge
b
ranch
'
js/nedmal
l
oc-g
c
c
6-warnings' into maint
commit
|
commitdiff
|
tree
2016-08-10
J
u
nio C Ham
a
no
Merg
e
br
a
nch 'nd/f
b
sd-lazy
-
mtime' into
m
a
i
nt
commit
|
commitdiff
|
tree
2016-08-10
Jun
i
o C
H
a
m
ano
Merge branch 'ab/gitweb-link-html-
e
scape' int
o
maint
commit
|
commitdiff
|
tree
2016-08-10
J
u
n
io C Hamano
Me
r
g
e
branch 'js/t4130-rename-witho
u
t-i
n
o' into maint
commit
|
commitdiff
|
tree
2016-08-10
Ju
n
io
C
Hamano
Merge branc
h
'jc/gre
p
-c
o
mman
d
line-vs-configuration
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
J
u
ni
o
C H
a
mano
Merge branch 'jk/diff-do-not-reuse-wtf-n
e
eds
-
c
l
eani
n
g
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
Junio C Hamano
M
e
rge
branch 'pm/build-persisten
t
-
https-with-recent
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
Junio C Hamano
Me
r
ge b
r
anch 'da
/
su
b
t
r
e
e
-2
.
9-regres
s
i
on' int
o
maint
commit
|
commitdiff
|
tree
2016-08-10
J
u
nio C Hamano
Me
r
ge branch
'o
s
/
no
-
veri
f
y-
s
k
i
ps-commit-msg-too'
into
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
Junio C Hamano
Merge branch 'rs
/
rm-strbuf-optim' into maint
commit
|
commitdiff
|
tree
2016-08-10
Junio C Haman
o
Merge branc
h
'jk/parse-o
p
tions-con
c
a
t
' into maint
commit
|
commitdiff
|
tree
2016-08-10
J
u
nio C Hamano
Merg
e
bran
c
h 'ls/travis-enab
l
e-
h
ttpd-tests' into maint
commit
|
commitdiff
|
tree
2016-08-10
Junio C
H
a
m
a
n
o
Merg
e
b
r
a
nc
h
'ew
/
auto
c
onf-pthre
a
d' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2016-08-10
Jun
i
o C Hamano
Merge
b
ran
c
h 'rs/h
e
lp-c-source-with-gitattribu
t
es'
.
.
.
commit
|
commitdiff
|
tree
2016-08-10
Junio C Hamano
Merge branch 'm
m
/
status-suggest-
m
erge-a
b
ort
'
into maint
commit
|
commitdiff
|
tree
2016-08-10
M
i
chael
S
t
a
hl
document g
i
t-repack interact
i
o
n
of pa
c
k
.
t
hreads an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-08
Junio C Haman
o
Hope
f
ully final batch for 2
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-08
J
u
nio C Ha
m
ano
Merge branch 'sb/pac
k
-pr
o
tocol-doc-nak' int
o
maint
commit
|
commitdiff
|
tree
2016-08-08
J
unio C Hamano
Merge branch
'rs/submodule
-
c
o
nfig-cod
e
-c
l
ea
n
u
p' into
.
.
.
commit
|
commitdiff
|
tree
2016-08-08
Ju
n
io C Hamano
Merg
e
branch 'sb/submod
u
le-deinit-all' in
t
o maint
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Merge branch 'rs/
w
orktree-use-strbuf
-
absolute-pat
h
.
.
.
commit
|
commitdiff
|
tree
2016-08-08
Jun
i
o
C
H
amano
Me
r
ge branch 'jc/d
o
c-diff-filter-
e
xclude' into mai
n
t
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Merge branch 'nd/tes
t
-
helpers' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Merge branch
'rs/use-strbuf-addbuf' into ma
i
nt
commit
|
commitdiff
|
tree
2016-08-08
J
u
nio C Hamano
M
erge branch 'lf/recv-sideband-
c
leanup
'
into maint
commit
|
commitdiff
|
tree
2016-08-08
Ju
n
io C Hamano
M
e
rge bran
c
h 'ah/un
p
ack-
t
rees-
a
dv
i
ce-messages' into
.
.
.
commit
|
commitdiff
|
tree
2016-08-08
Junio
C
Hamano
Me
r
ge
b
r
anch 'lf/side
b
and-returns-void' into mai
n
t
commit
|
commitdiff
|
tree
2016-08-08
Junio C
H
a
man
o
Merge br
a
nch
'j
k
/sen
d
-pack-stdio' int
o
m
a
int
commit
|
commitdiff
|
tree
2016-08-08
Junio C
H
amano
Merge branch
'p
b
/
c
ommit-ed
i
tmsg-path' into maint
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Merge branch 'ew
/
find-per
l
-on-freebsd
-
in-lo
c
al' into
.
.
.
commit
|
commitdiff
|
tree
2016-08-08
J
u
nio
C H
a
mano
Merge
branch 'ew
/
d
a
emon-sock
e
t-keepalive' in
t
o maint
commit
|
commitdiff
|
tree
2016-08-08
J
unio C H
a
mano
Merge b
r
anch 'nd
/
pa
c
k
-
of
s
-4gb-l
i
mit' into mai
n
t
commit
|
commitdiff
|
tree
2016-08-08
J
u
n
io C
Hamano
Mer
g
e branch 'rs/notes-merge
-
no-toctou' into maint
commit
|
commitdiff
|
tree
2016-08-08
Junio C H
a
m
a
no
M
e
r
g
e branc
h
'js
/
ignore-spac
e
-a
t
-
eol' into maint
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Merge b
r
an
c
h 'jk
/
push-scrub
-
ur
l
' into maint
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Me
r
ge branch 'nd
/
ca
c
he
-
tree-it
a
' in
t
o main
t
commit
|
commitdiff
|
tree
2016-08-08
Junio C Hamano
Merge branch 'mh/blam
e
-wor
k
tree' i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2016-08-08
J
ohannes Schi
n
d
e
lin
git
mv: do n
o
t k
e
e
p slash in `git
m
v dir non-
e
xi
s
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-06
René Scharfe
us
e
strbuf_add
_
uni
q
ue
_
abbr
e
v() for adding short hashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-05
René Scha
r
f
e
n
e
dmalloc: work around
o
verzealous GCC 6 warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-05
René Schar
f
e
merge:
u
s
e
st
r
ing_l
i
st_split() in
a
dd_strategies()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-05
R
e
né Scharfe
me
r
ge-recursive: use
STRING_LIST_INIT
_
NO
D
UP
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-05
René Scharfe
use strbuf_addst
r
() instead of
s
trbu
f
_addf() wi
t
h
"
%s"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-04
J
o
hanne
s
S
ch
i
nd
e
lin
nedmalloc: fix m
i
s
l
eadi
n
g indentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-04
Joh
a
n
nes Schindelin
t5533:
make
it pass o
n
case-sens
i
tive filesyst
e
ms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-04
Nguy
ễ
n
Thái Ngọc Duy
t
7063: work arou
n
d FreeBSD's lazy mtime
u
p
d
at
e
feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-03
Joey Hess
clarify %f doc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-03
Johannes Sch
i
ndelin
import-tars:
support hard links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-03
Johannes Sixt
t4130: wo
r
k around
Windows limitation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next