repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make difftool.prompt fall back to mergetool.prompt
2010-01-22
J
unio C
H
amano
git
-
mv
:
fix mo
v
i
ng
m
ore than
one s
o
ur
c
e to a s
i
ngle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merge b
r
anch
'm
a
int
'
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o
C Haman
o
merge
-
recursive: do not
return NULL only
to cause segf
a
ult
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
conflict-mark
e
r
-size: add t
e
st and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update draft
r
elease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch '
b
w/
c
vsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge bra
n
ch 'jc
/
checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Me
r
ge branch '
a
g/
p
atch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merg
e
branch 'jc/conflict-mar
k
er
-
size'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hama
n
o
M
e
rge bra
n
ch 'ag/maint-
a
pp
l
y-
t
o
o-large-p'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Hamano
Me
r
ge
b
r
anch 'ap/merg
e
-bac
k
end-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C
Hama
n
o
Me
r
ge branch 'nd/
s
tatus-par
t
ial-refre
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Ham
a
no
Merge re
m
ote
b
ranch 'remotes
/
tr
a
s
t
-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C
Hamano
Merge b
r
anch
'
jh/notes' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
M
erge
branch
'jc/maint
-
re
f
r
e
sh-in
d
ex-is-opt
i
onal-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Merge branch '
r
r/co
r
e-tu
t
orial'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branc
h
'j
c
/ca
c
he-
u
nmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C
Hamano
Merg
e
bra
n
ch
'
js/ex
e
c-error-re
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Merge
branch 'jc/ls-files-ignored-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch
'jc
/
maint-s
t
rbuf
-
add-fix
-
doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
ano
Merge branc
h
'mm/
c
onfli
c
t-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
Merge bran
c
h '
d
a/
d
ifftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
bran
c
h
'mh/rebase-f
i
xup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge
b
ranch 'n
s
/
rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Me
r
ge branch 'mh/re
b
ase-fi
x
up'
(
e
arly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Merg
e
b
ranch '
i
l/p
u
sh-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
Merge branch
'
jk/w
a
rn-author-
c
ommi
t
ter-after-
c
o
m
m
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Merge branch 'j
c
/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
a
nch
'tr/
h
ttp-p
u
sh-ref-statu
s
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
M
erge br
a
nc
h
'bk/fix-relati
v
e-git
d
ir-fil
e
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Ha
m
a
no
Mer
g
e branc
h
's
d
/cd-p-show-t
o
p
l
evel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge branch 'j
c
/symbol
-
static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
date
.
c
:
ma
r
k file-local function
s
tati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Sync wi
t
h 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Me
r
g
e
b
r
anch 'bg/maint-remote-update-default'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
b
ranch
'sb/maint
-
octop
u
s' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
M
e
rge
br
a
nch 'bg/maint-add-all-doc'
into main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge b
r
anch 'j
k
/
m
aint-1
.
6
.
5-reset-
h
ard' into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/maint-1
.
6
.
5-ba
s
h-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
an
c
h
'
dp/maint-1
.
6
.
5-fast-
i
mp
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
b
r
a
n
c
h
'jm/m
a
i
nt-1
.
6
.
5-grep-NUL-te
r
m
inate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Fi
x
"c
h
eckout
A
.
.
.
" syno
n
ym for "ch
e
ckout A
.
.
.
HEA
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
status: don't r
e
quire t
h
e repositor
y
to
b
e writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge
branc
h
'main
t
-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Haman
o
M
e
rge branch 'maint-1
.
6
.
3' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'maint-1
.
6
.
2
'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Haman
o
Merge c
o
m
m
it '
v
1
.
6
.
4
.
4-
8
-g8de6518
'
into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Fix mis-backport of
t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
Update draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
ano
U
p
date d
r
aft r
e
lease notes
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Merg
e
branch 'd
p
/maint-1
.
6
.
5
-fa
s
t-impo
r
t-non-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Haman
o
Mer
g
e branch
'jc
/
re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io
C
Hamano
Merge
b
ranch
'
pc/uninteresti
n
g
-su
b
m
o
dule-d
i
sappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
amano
Merge
b
ranch 'nd/include-termios-f
o
r-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C
Hamano
M
e
r
g
e bran
c
h 'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge b
r
anch 'jm/maint-1
.
6
.
5-grep-N
U
L-terminat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
symlinks
.
c: remove un
u
sed functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
an
o
obje
c
t
.
c: remove un
u
sed functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that m
e
rge st
r
ategies
can no
w
ta
k
e their
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Ma
k
e "subtree" part more orthogona
l
to
t
he rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ha
m
ano
pull: F
i
x parsing of -
X
<o
p
tio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
Upd
a
te draft rel
e
ase notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
man
o
M
e
r
ge branc
h
'
tc/t
e
st-locate-
h
ttpd
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
no
Merge branch
'
jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
a
man
o
Merge bran
c
h 'jn/makef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge
b
ranc
h
'jc/maint-1
.
6
.
1-checkout-m-cus
t
o
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch 'tc/c
l
one-v-
p
rogress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
rge bra
n
ch '
t
c/sma
r
t-http-restri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Me
r
ge branch 'jk/run-co
m
mand-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
M
erge br
a
nc
h
'
s
r/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
Update
C
O
P
YING with GPLv2
with new FSF ad
d
r
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C
Hamano
user_id
e
nt_suffici
e
nt
l
y_given(): refactor th
e
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
us
e
r_iden
t
_suf
f
icie
n
tl
y
_given(): r
e
factor t
h
e
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
rer
e
r
e
:
honor conflict-m
a
rker-size attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
rerere: prepare for
c
u
s
tomi
z
able conflict marke
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commi
t
.
c
::print_summ
a
ry:
do not r
e
lease the
f
ormat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
ano
con
f
l
i
ct-mark
e
r-
s
ize: new a
t
tribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
rerere:
u
s
e ll_
m
erge() instead of using x
d
l_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree: u
s
e ll
_
mer
g
e() not x
d
l_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_merge()
:
allow passing dow
n
m
a
rker_size in xm
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
aman
o
x
dl_mer
g
e(): introd
u
ce
x
mparam_t for
m
erge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
git_attr(): fix func
t
i
o
n
sig
n
a
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge br
a
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
M
erge
b
r
anch '
c
c/reset-more'
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io C
Hamano
grep --no-inde
x
:
a
llow
use of "git grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: prepare to run outside of a wo
r
k
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
ni
o
C Hamano
Me
r
ge branch '
j
c/checkout-
m
erge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch '
r
s/mai
n
t
-
archive-match-p
a
thspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erge b
r
anch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
strbuf_addb
u
f()
:
a
llow pass
i
ng
the sam
e
buf
t
o d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merg
e
branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Me
r
ge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
ma
n
o
t7502: t
e
st com
m
it
.
status, --stat
u
s and --
n
o-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next