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
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
2013-01-22
Ramsay Jones
Make
f
ile: Replace m
e
rge-fil
e
.
h with merge-blo
b
s
.
h in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C
Hama
n
o
me
r
g
e-tree: fix
d
/f conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Juni
o
C
Hamano
merge-tree: add
comm
e
nts to clarify what
t
hese functions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hama
n
o
merg
e
-tree
:
lose unused
"
r
e
solve_dir
e
ctories"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Jun
i
o C Hamano
merge-tree: lose unu
s
ed "flags" from m
e
rge_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-10
J
u
nio C Hamano
Whi
c
h merg
e
_fi
l
e()
f
u
nction do yo
u
mean?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-04
J
u
ni
o
C Hamano
Merge bran
c
h
'mm/status-push-
p
ull-
a
dvise'
commit
|
commitdiff
|
tree
2012-12-04
M
atth
i
eu Moy
doc
u
ment that statusHints affects git checkou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
Juni
o
C
Hamano
G
i
t 1
.
8
.
1-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Ha
m
ano
Merge branch
'
m
m/status-push-pull-adv
i
se'
commit
|
commitdiff
|
tree
2012-12-03
Jeff
K
i
ng
st
a
tus
:
respec
t
advic
e
.
statusHi
n
t
s for
ahead/be
h
ind
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C
H
amano
Update dr
a
ft release notes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merge
b
ranch 'pw/p4-v
a
rious-fixes'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C H
a
mano
Merge
b
r
anch 'lt/diff
-
stat-show-0-line
s
'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C H
a
mano
M
er
g
e branch 'fc/re
m
ote
-
h
g'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C
Hamano
Merge branch
'
mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
M
erge branch
'
jc/doc-push-satellite
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
amano
Me
r
ge branch
'km/send-email-
r
em
o
ve-cruf
t
-i
n
-a
d
d
re
s
s'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hama
n
o
M
e
rge branc
h
'jk/send-email-sender-promp
t
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge
branch 'fc/
s
end-email-no-sender-pr
o
m
p
t'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
am
a
n
o
Mer
g
e
bra
n
ch 'er
/
doc-add-new-commands'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Mer
g
e branch 'jl
/
submodule-rm'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C
Hamano
Merge branch 'pp/git
w
e
b
-co
n
fig-undersco
r
e'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
Merge branc
h
'fc/c
o
m
p
l
e
tion-
t
est-simplifi
c
a
tion'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-11-29
Matthieu Moy
git-fast-import
.
tx
t
: i
m
prove documentation for quoted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Matth
i
e
u
Moy
git-remote-media
w
i
k
i:
escape ", \, and LF in fi
l
e names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio
C Hamano
Mer
g
e branch
'master'
of git
:
/
/
github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
t40
4
9: refocus tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
F
elipe Co
n
t
r
eras
comp
l
etion: fi
x
w
arning for
z
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C
Ham
a
n
o
M
erg
e
b
ra
n
ch '
m
a
ster' of git:/
/
gi
t
hub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Hamano
Merge b
r
anch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Update draft
r
e
lease notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merg
e
b
ranch 'fc/zsh-co
m
pletion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Ham
a
no
Merge br
a
nch 'mm/status-push
-
pull-advi
s
e
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C H
a
mano
Merge branch '
j
k/
p
ic
k
axe-text
c
on
v
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
S
t
art prep
a
ri
n
g
for 1
.
8
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
J
e
f
f
Ki
n
g
t9001: c
h
eck send-e
m
ail behavior with impl
i
c
it send
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
Merge branch 'rh/maint-git
w
eb-highl
i
ght
-
ext' into maint
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
M
e
rge branch
'pw/maint-p
4
-rcs-exp
a
nsion-ne
w
l
i
n
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ral
f
Thielow
c
o
m
pletion: a
d
d options --single-branch and
-
-branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Hamano
Merge branch
'fc/sen
d
-
e
mail-no-sender-
p
rompt' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jeff King
t: add tests for "git v
a
r"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Do
c
umentation/git-push
.
t
x
t: clarify t
h
e "push from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contreras
remote-hg:
f
ix f
o
r older versions of py
t
hon
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
F
elipe Contreras
re
m
ote-hg: fix fo
r
files wi
t
h spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
diff --shortstat: do
not c
o
unt "unmerged" e
n
tries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
amano
Mer
g
e bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio
C
H
amano
M
erge branch '
n
d
/
maint-compa
t
-fn
m
atch-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge bra
n
c
h
'j
h
/upda
t
e-ref-d-thr
o
u
g
h-symre
f
' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
M
e
r
g
e bra
n
ch
'
esr/mai
n
t-doc-fast-imp
o
rt' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-27
J
unio C H
a
mano
Merg
e
branch 'wt
k
/submodule-doc
-
f
ixup' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --st
a
t: do not
count "u
n
m
erged" entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
unio
C Hamano
diff --st
a
t
:
move the "t
o
tal c
o
u
n
t" lo
g
ic to the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --stat
:
use "fi
l
e" temporary
v
ariable
to refer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
unio
C
Hamano
di
f
f -
-
st
a
t
:
sta
t
us
o
f unmodified pa
i
r in diff-
q
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Ha
m
a
no
t
e
st: add failing te
s
t
s for "d
i
f
f
-
-stat"
to
t4049
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Ma
r
c
K
h
o
uzam
Support fo
r
g
i
t aliasin
g
for tcsh
c
ompletio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
M
a
r
k
Sze
p
i
eniec
Documentation: improve
p
hrasi
n
g in git-push
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzy
s
zto
f
Maz
u
r
git-send-ema
i
l: allow edit
i
n
v
a
li
d
email addres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krz
y
sztof Mazur
gi
t
-send-email:
a
sk what
t
o
d
o
with an i
n
vali
d
email
.
.
.
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof M
a
z
u
r
g
it-send-email:
r
emove inva
l
i
d
a
ddres
s
e
s
earlier
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Merge
branc
h
'
maint'
commit
|
commitdiff
|
tree
2012-11-26
E
ric S
.
Raymond
Documentation: how to ad
d
a new c
o
m
m
a
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
A
n
toine Peli
s
se
Fix t
y
po in
r
emote
s
et-head usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Felipe Contreras
se
n
d
-email: avoi
d
q
u
estions
when user ha
s
an i
d
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete
W
y
c
koff
git p4: remove
u
nneeded cmd
i
nitial
i
zatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pe
t
e Wycko
f
f
git p4: fix labelDetails typo in exception
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4 test: di
s
p
lay unresolvable
h
o
st error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
P
e
t
e Wyckoff
git p
4
: catch p4
errors when
streaming
file contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete
W
yckoff
git
p
4
:
hand
l
e
servers
wi
t
hou
t
move support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4: c
a
t
ch p
4
describe errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Paul Gortm
a
ker
Makefile: hi
d
e stde
r
r
o
f
curl-config test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Enrico Scholz
ema
c
s
: make
'git-st
a
tus' work with
s
ep
a
rat
e
git dirs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzy
s
ztof Mazur
g
it-se
n
d
-email:
f
ix fallback code in extr
a
ct_v
a
l
id_addre
s
s
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof
Mazur
g
i
t
-se
n
d-email:
remov
e
ga
r
ba
g
e after email a
d
dres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
a
mano
Upd
a
te
d
raft release notes
to
1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Ham
a
n
o
Merge
branch 'rr/submodule-diff
-
c
o
nfig'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
M
e
rg
e
bra
n
ch 'nd/maint-compat-fnm
a
tch-fix'
commit
|
commitdiff
|
tree
2012-11-26
J
uni
o
C
H
amano
Merge branch 'bc/do-not
-
recurse
-
in-d
i
e'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
am
a
no
Merge b
r
anch 'mk
/
complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C
Hamano
M
e
rge branch 'jh
/
up
d
ate-re
f
-d
-
through-symref
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch
'
lt/dif
f
-stat-show-
0
-lines'
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C
Hamano
Merge branch 'sg/complete-help-undup'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Sync
w
ith
1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Hamano
Git 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Merge branch 'jk/checkout-out-of-unborn' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C
H
ama
n
o
Mer
g
e br
a
nc
h
'c
n
/config-mis
s
i
n
g-path' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge br
a
nch 'jk/ma
i
nt-git
w
e
b
-xss' into
maint
commit
|
commitdiff
|
tree
2012-11-25
M
arc
K
h
ouzam
C
omple
t
ion must sort b
e
f
ore using uniq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-24
Jens Leh
m
ann
T
e
ach rm to remove submodules when
g
iv
e
n
with a trailing '/'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Up
d
ate draft release n
o
tes for 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
J
unio C Ham
a
no
Me
r
ge branch 'esr/maint-doc-fast-import
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C
Hamano
Me
r
ge b
r
anch
'wtk/submodule-doc-fixu
p
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge br
a
nch
'so
/
prompt-comma
n
d'
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C
H
am
a
no
Merge branch 'jk/config-i
g
nore-duplicates'
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C Hamano
Merge branch 'jk/maint-http-half-a
u
th-fetch'
commit
|
commitdiff
|
tree
2012-11-21
Phi
l
P
e
n
nock
gitweb: make remote_heads config
s
etting work
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Ramsay Jones
remot
e
-
curl
.
c: Fix a
co
m
pil
e
r warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Ngu
y
ễn Thái Ngọc
Duy
co
m
pat/fnmatch: fix
o
f
f
-by-one character
c
lass's l
e
ngth
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next