repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: remove an null statement
2016-05-19
Junio
C
Hamano
rerere
:
remove
an null statement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-05-11
J
u
nio C H
a
mano
rerere: plug memory leaks up
o
n
"
rerere forg
e
t
"
failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
rer
e
re: adjust 'forget' to multi-vari
a
nt worl
d
or
d
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hama
n
o
rerere: split code
t
o call ll_mer
g
e() further
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
J
u
nio C Hamano
rerere
:
move code related to "forget
"
together
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
J
u
n
io C Hamano
rerere
:
g
c
and clear
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Junio C
Hamano
r
erere: do use multiple va
r
iants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Ju
n
io C Haman
o
t4200: rerere a merge with
t
wo identic
a
l conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
J
unio C
Hamano
re
r
ere: al
l
o
w multiple variants to exist
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
J
unio C Hamano
rer
e
re: delay
t
he recording of preimage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
rer
e
re: handle lef
t
over rr-cac
h
e/$ID directory and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-08
Junio C Hamano
rerere: scan $GIT_DIR/
r
r-cache/
$
ID when instantiatin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-08
Junio C Hamano
rerere
:
spl
i
t c
o
n
fli
c
t ID further
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-08
Jeff King
r
e
rere: repl
a
ce
strcp
y
with xsnprintf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hamano
rerere: un
-
nest m
e
rge(
)
furthe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
H
a
ma
n
o
rerere:
use
"struct rerere
_
id"
i
nstead of
"cha
r
*"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Hamano
r
e
r
ere: c
a
ll
c
onflict-ids
I
Ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
n
io
C
Hamano
rerere: furt
h
e
r
clarif
y
do_rerere_
o
ne_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerer
e
: furt
h
er de-dent
do_plain_rerere()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
unio C
H
amano
rerere: refact
o
r "replay
"
part of do_plain_rerere()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ham
a
no
rere
r
e:
e
xplain the
remai
n
der
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: explain "r
e
rere for
g
e
t" codepath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C
Hamano
rerere: e
x
plai
n
the primary codepa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerer
e
: expla
i
n
M
ERGE_RR management
helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
re
r
e
re
:
f
ix benign off-by-one non-bug and clarify code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Hamano
r
e
rere: explain the rerere I/
O
a
b
stracti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C
Hamano
r
e
rer
e
: do
not leak
mmfile[
]
for a p
a
th with multi
p
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
amano
rerere: stop loo
p
ing unnecessa
r
i
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: dr
o
p want_
s
p parameter from
is
_
cmarker()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
m
ano
rerere: repor
t
a
utoupdated
p
aths only
after actually
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o
C H
a
m
ano
rerer
e
:
wri
t
e out each record o
f
MERGE_R
R
i
n
one go
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
Hamano
rerere: lif
t
PA
T
H
_
M
A
X limita
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hama
n
o
rerere:
p
lug conf
l
ict I
D
leaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C
H
amano
r
ere
r
e: handle c
o
nflicts
w
ith mult
i
ple stage
#
1 entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-28
Junio C Ha
m
an
o
r
erere: fix
an
o
ff-by-one non
-
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io C Ha
m
ano
Git
2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'
mm/usage-l
o
g
-
l-c
a
n-take-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch
'j
c
/diff-no-index-
d
-f' into m
a
int-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
Merge branch 'o
h
/
f
ix-c
o
nfig-def
a
ult-user-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge
b
ranch 'jc/epochtime-wo-tz' into main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Merge branch 'tb/conn
e
ct-ipv6-parse-fix
'
into
maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
Merge branch 'ma/b
a
sh-comple
t
ion-le
a
king-x' into m
a
int
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hama
n
o
M
e
r
g
e branch 'jc/push-cert' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
m
an
o
Git 2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
M
erge br
a
nch 'jk/colors' into main
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge branch 'jk/te
s
t-annoyances'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio
C Haman
o
Merge branch 'pt
/
enter-repo-comment
-
fix' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge br
a
nch 'jz/gitweb
-
conf-doc-fix
'
into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge branch 'jk/cherry
-
pi
c
k-d
o
cfix' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branc
h
'iu/fix-parse-op
t
ion
s
-h-co
m
ment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o C
Ham
a
no
M
e
rge branch
'jg/cguid
e
-we-
c
an
n
o
t-co
u
nt' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merg
e
branch 'jk/pac
k
-co
r
ruption-pos
t
-mortem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Mer
g
e
b
ranch
'
jn/doc-
f
ast-i
m
port-no-16-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-20
Matthieu Moy
log -L: improve err
o
r me
s
sage o
n
malforme
d
ar
g
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Matthieu M
o
y
Docu
m
ent
a
ti
o
n
: change -L:
<
regex>
to -L:<funcname>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-17
Ossi
Herrala
c
o
nfig: fix settings in default_user_config template
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
J
u
nio C Hamano
parse_d
a
t
e
_basic(
)
: l
e
t t
h
e system ha
n
dle
D
ST conve
r
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Juni
o
C Hamano
parse_date_basic(): return early when given a bo
g
us
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Julian
G
indi
C
odingGui
d
elines
:
update 'rough'
r
ule c
o
u
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-13
Márcio Almada
com
p
letion: fix global ba
s
h
v
ar
i
able leak on
_
_gi
t
c
ompappe
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-09
Torsten Bögersh
a
use
n
connect
.
c: ignore ext
r
a c
o
l
on after hostname
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-04
Kyle J
.
McKay
diff-hig
h
light: do not split multibyt
e
characters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio
C Hamano
p
u
s
h
--si
g
ned: tighten
w
hat the re
c
eiving en
d
can a
s
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Je
f
f King
howto: document more tools for recovery
corrupt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-01
Jonathan
Nieder
fast-import doc: remove suggested 16-paren
t
limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
J
u
nio C Hamano
G
it 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merg
e
branch
'
ss/pull-reb
a
se-preserve' into maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Ha
m
a
no
Merge branch 'jc/report-path-error-to-
d
i
r
' into maint
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C H
a
mano
Merge branch 'p
h
/
p
ush-d
o
c-cas' into maint
commit
|
commitdiff
|
tree
2015-03-31
J
ér
ô
me Zago
gitweb
.
conf
.
txt: say "b
u
ild-tim
e
",
n
ot "
b
u
i
lt-time"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter_r
e
po(): fix docs
t
o match code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Jeff King
cherry
-
pick:
f
ix d
o
cs descri
b
i
ng handling of empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-30
S
e
bastian Schubert
h
docs: clarify what git-reb
a
se's "-p" / "--preserve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-30
Ivan U
k
hov
parse-options
.
h: OPTION_{BI
T
,SET
_
I
N
T
} do
not stor
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
P
repar
e
f
or 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Mer
g
e branch 'sg/co
m
p
leti
o
n-g
i
tcomp-nl-for-refs'
into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Merge branch 'jk/si
m
plify-csum
-
file-sha1fd-check' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
Merge branch 'tg/test-index-v4'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Mer
g
e
b
ranch 'nd/d
o
c
-
g
i
t-in
d
ex-versi
o
n' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
a
m
ano
M
e
rge branc
h
'ct/prompt
-
untrac
k
ed
-
f
i
x'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
M
erge branch 'ws/grep-quiet-no-p
a
ger' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Me
r
g
e
branch 'jc/submit
t
i
ng
-
p
a
tch
e
s
-
mention-
s
end-
e
mail
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Me
r
g
e
branch '
j
k/cleanup-faile
d
-
c
l
o
ne' into maint
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Hamano
Merge branch 'jk
/
fetch-pack' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
ama
n
o
Merge br
a
nch
'tg/
f
ix-check-
o
r
d
er-with
-
split-index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
Merge branch
'
j
k/pr
u
n
e
-with-
c
orrupt-refs' into maint
commit
|
commitdiff
|
tree
2015-03-28
T
homa
s
Ackermann
2
.
3
.
2 release notes:
t
ypofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-27
J
unio
C
Ham
a
no
Merg
e
b
r
anch 'jk/tag-h-col
u
mn-is-a-listi
n
g-option'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Merge branch 'jk/
s
mart-http-hide-r
e
fs' into maint
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
M
e
rge branch 'js/
c
ompletion-ctags-pattern-s
u
bstitution
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Update mailmap to
s
p
e
ll out "Alexander Kuleshov
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio C Haman
o
diff-no-i
n
dex: a
l
ign
D
/
F handling with
t
hat of nor
m
al
Git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Seb
a
stian S
c
hube
r
th
docs: clarify "pr
e
serve" option w
o
rdin
g
for git
-
pull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Ph
i
l Hord
g
it-push
.
txt: clean up force-
w
ith-lea
s
e w
o
r
ding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
J
uni
o
C
H
a
mano
d
iff-no-index: DW
I
M
"
diff D F"
i
nto "
d
i
ff D/F F"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
Junio C Hamano
report_path_er
r
o
r():
move to dir
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
N
guyễn Thái Ngọc Duy
git
.
txt
:
list i
n
dex
versions i
n
pla
i
n Englis
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Haman
o
Git 2
.
3
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge
b
ra
n
ch 'rs/u
s
e-i
s
xdigit'
into ma
i
nt
commit
|
commitdiff
|
tree
next