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
Merge branch 'jk/rebase-i-submodule-conflict-only'
2012-04-23
Junio C H
a
man
o
M
e
rge
b
ranch 'jk/re
b
ase-i
-
submodul
e
-
conflict-only'
commit
|
commitdiff
|
tree
2012-04-20
Junio C
H
am
a
no
RelNotes: the
third batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Merge branch 'js/spawn-v
i
a-s
h
e
ll-p
a
th-fi
x
'
commit
|
commitdiff
|
tree
2012-04-20
Juni
o
C Hamano
Merge
branch
'ct/advise
-
push-defaul
t
'
commit
|
commitdiff
|
tree
2012-04-20
Jun
i
o C Ha
m
ano
M
e
r
ge bra
n
ch 'bw/s
u
bmodule-
s
ed-solaris'
commit
|
commitdiff
|
tree
2012-04-20
Junio C
Ham
a
n
o
Mer
g
e branch 'jk/run-command-eacces'
commit
|
commitdiff
|
tree
2012-04-20
Junio
C Hamano
Merge branch '
j
c
/
pus
h
-upstr
e
am-s
a
nity'
commit
|
commitdiff
|
tree
2012-04-20
Jun
i
o
C
Hamano
M
erge bra
n
ch
'
j
c
/am-report-3way'
commit
|
commitdiff
|
tree
2012-04-20
Ju
n
io C Hamano
Merge branch 'j
b
/am-include'
commit
|
commitdiff
|
tree
2012-04-20
J
u
nio C Haman
o
Merge branch '
j
c/fmt-m
e
rge-msg-peo
p
le'
commit
|
commitdiff
|
tree
2012-04-17
Jo
h
an
n
es Sixt
Do not u
s
e
SH
E
LL_PAT
H
from
bui
l
d system in prepare_shel
l
_cmd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Juni
o
C H
a
mano
RelNotes: the second batch
o
f t
o
pics graduate
d
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Junio C Ha
m
ano
Merge branch 'jk/add
-
p-
s
kip-conflicts'
commit
|
commitdiff
|
tree
2012-04-16
Junio C
H
amano
Mer
g
e branch 'jc
/
commit-unedited-template'
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-16
J
u
n
i
o C Hamano
Me
r
ge br
a
nch
'bw
/
spawn-via-shell-pa
t
h'
commit
|
commitdiff
|
tree
2012-04-16
Junio
C
Hamano
Merge
b
ranch 'wk/gitwe
b
-snapshot-
u
s
e
-if-
m
od
i
fi
e
d-since'
commit
|
commitdiff
|
tree
2012-04-16
Junio C
Hamano
Merge bran
c
h 'jk/http-b
a
ckend-k
e
ep-committ
e
r-ide
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-16
Jun
i
o C Ham
a
no
Merge branch
'
s
l/
a
uto
c
onf'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Ha
m
ano
M
e
rge b
r
an
c
h
'j
k
/br
a
nch-quiet'
commit
|
commitdiff
|
tree
2012-04-16
Junio
C
Hamano
Merge branch 'rs/combi
n
e
-
diff-zero-co
n
te
x
t
-
at-the-beginnin
g
'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Mer
g
e bra
n
c
h
'
j
k/d
i
ff-no
-
rename-empty'
commit
|
commitdiff
|
tree
2012-04-16
Junio C H
a
mano
Merge bran
c
h 'jc/m
a
int-clean-nested
-
worktree-in-subdir'
commit
|
commitdiff
|
tree
2012-04-16
Junio C
H
amano
Merge b
r
anch 'rs/unpack-trees-lea
k
fix'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge branc
h
'nl/reba
s
e-i-
c
heat-sheet'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
RelNote
s
: the first bat
c
h of topics graduated to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge branch 'da/difftool-test'
commit
|
commitdiff
|
tree
2012-04-16
Ju
n
i
o C Hamano
M
erge branch '
z
j/test-cred-helper-nicer-prove'
commit
|
commitdiff
|
tree
2012-04-16
Junio C
H
amano
Merge branch '
j
h/notes-merg
e
-
i
n-
g
it-dir-worktr
e
e'
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
M
erge branch 'tr/maint-word-diff-reg
e
x-sticky'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge branc
h
'jn/
d
iffstat-tes
t
s
'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
M
e
rge
branc
h
'jc/diff-algo-clean
u
p'
commit
|
commitdiff
|
tree
2012-04-16
J
u
n
io
C
H
amano
Merge bran
c
h '
j
c/commit
-
hook-au
t
horshi
p
'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Haman
o
Merge
branch 'nd/stre
a
m-more'
By Nguyễn Thái Ngọc Duy (6) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-16
Cle
m
ens Buchach
e
r
mer
g
e o
v
erwrite
s
unsta
g
e
d changes in renamed file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-12
Ch
r
istopher Tiwald
Fi
x
httpd te
s
ts t
h
at broke
w
hen non
-
ff push ad
v
ice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
J
u
ni
o
C
Ha
m
ano
Kick
o
ff
p
os
t
1
.
7
.
1
0
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Sebastian
P
ipping
gitweb
:
Fi
x
un
i
ntended "--no-merges
"
for regular A
t
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Scha
r
fe
unpack-trees: plug minor memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Re
n
é Scharfe
u
n
pack-tre
e
s: don't p
e
rform a
n
y index operation if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2012-04-10
Jun
i
o C Hamano
Me
r
g
e
branch
'
maint-1
.
7
.
9' in
t
o maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merg
e
branch 'main
t
-1
.
7
.
8' into ma
i
nt-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Sc
h
a
r
f
e
test-sub
p
r
o
cess: fix segfaul
t
wi
t
h
out
arg
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
subm
o
dule:
fi
x
proto
t
ype of gitmodules_con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
J
ohn Keeping
reba
s
e -i continue: don't skip commits that only change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Ben Walton
Avoid bug in
S
olaris xpg4/sed a
s
u
s
e
d
in s
u
bmodu
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
Merge
b
r
a
n
ch 'jc/mai
n
t
-verify-objects-remove-p
e
s
s
imism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C
H
ama
n
o
M
e
r
ge bran
c
h 'd
w
/gi
t
web-
d
oc-
g
rammo'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
M
e
rge
branch
'
tr/
c
ache-tree'
i
nt
o
ma
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
Merge branch 'cb/main
t
-t554
1
-
m
ake-serv
e
r-port-po
r
t
a
ble
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge b
r
anch 'cn/maint-rev-list-doc' into main
t
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Hamano
Merge branch '
t
r
/
maint-bundle-boun
d
ary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge br
a
nch 'tr/maint-bundle-long-subje
c
t' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merg
e
b
ran
c
h 'ph/rerere-
d
oc' i
n
t
o maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio C Hamano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Felipe
Contre
r
as
spec: add
m
issing build d
e
penden
c
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Jeff King
run-command: treat inaccess
i
ble direc
t
ories as ENOENT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Ramsay Jone
s
c
o
mp
a
t/
m
ingw
.
[ch]: Cha
n
ge re
t
urn type of e
x
ec functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Jun
i
o C
Hamano
pus
h
: erro
r
out w
h
en the "
u
ps
t
ream" semantics does
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
J
eff King
ad
d
--
i
n
t
e
r
a
ctive:
ignore unmerged ent
r
ies in patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-04
B
e
n Walton
Use SHELL_PATH from bu
i
ld
system in run_command
.
c:prep
a
re_s
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
u
nio C
Hamano
D
oc
u
mentation/git-commit:
rephra
s
e
the "
i
nitial-
n
e
ss
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Junio C
Hamano
G
it 1
.
7
.
10-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
m
a
no
Merge branch 'pt/git
k
'
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C
H
amano
Sync with
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C
Hamano
G
it 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Mer
g
e b
r
anc
h
'jc/maint-
m
e
rge-a
u
toedit' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-04-02
P
at T
h
oyts
g
itk: f
i
x sett
i
ng font display wit
h
ne
w
tabbed dial
o
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
P
a
t
Thoyts
g
itk: fix tabbed pref
e
re
n
c
e
s con
s
truction when
u
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C
H
amano
Merg
e
git://gi
t
hub
.
c
o
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-04-01
Adam Monsen
git-commit
.
txt: clarify -t requires editi
n
g message
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-31
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-03-30
Junio C
H
amano
com
m
it: r
e
phrase th
e
e
r
r
o
r whe
n
user
d
id
n
ot touch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Hamano
c
ommit: do
no
t
t
rigger bogus "has
t
emplated m
e
ssage
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Juni
o
C Hamano
t
7
5
0
1: test t
h
e ri
g
h
t
k
i
nd of brea
k
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
J
e
ff King
ht
t
p-backend:
re
s
p
e
ct
existing GIT_
C
OMMITTER_* varia
b
le
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
W
.
T
r
e
vor King
gitweb:
add If-Modified-Since handli
n
g to git_snapshot()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
W
.
Trev
o
r King
gitweb
:
refactor If
-
M
o
dified-Since handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
W
.
T
r
e
v
or King
gitw
e
b
:
a
dd `s
t
a
t
us`
headers to git_fe
e
d() respon
s
es
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voigt
string-list: docum
e
nt that stri
n
g_list_ins
e
rt() in
s
erts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
R
e
n
é Scharfe
co
n
f
ig: r
e
move usele
s
s ass
i
gnment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
J
u
nio C Hamano
G
it 1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim M
e
yering
cor
r
ect
a few
doubled-word ni
t
s in comm
e
nts an
d
doc
u
me
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
J
o
hannes Berg
am: support --in
c
lu
d
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Juni
o
C
H
amano
am -3: list the path
s
that needed
3-way fallback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Me
y
e
r
ing
co
r
re
c
t spelling: an URL -> a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
J
unio
C
H
a
mano
l10n updates for Git 1
.
7
.
10-rc
1
commit
|
commitdiff
|
tree
2012-03-27
Zb
i
gni
e
w Ję
d
rzejewsk
.
.
.
tests: unset COLUMNS in
h
e
rited fr
o
m en
v
ironment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Jeff King
teach "git branch" a --q
u
i
e
t option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Jeff King
chec
k
out: suppr
e
ss tracking message with "-q"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Jeff King
clean up struct r
e
f
'
s nonfast
f
orward
fiel
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
amano
Update
d
raft release
no
t
e
s
to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Sync with 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
Git
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
ama
n
o
Me
r
ge bran
c
h 'j
n
/maint-
f
ast
-
i
m
p
o
r
t
-
emp
t
y-l
s
' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge
branch 'ph/rer
e
re-doc'
i
nto main
t
commit
|
commitdiff
|
tree
2012-03-26
J
u
n
io
C Hama
n
o
M
e
r
ge bra
n
ch 'ms/
m
aint-co
n
fig-error-at-eol
-
linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
M
a
r
k
Lodat
o
grep doc: add --brea
k
/ --heading / -
W
t
o
synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Stefa
n
o Lattarini
configure: be more idiomat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Stefano La
t
tarin
i
configure: avoid some code repet
i
t
i
ons thanks to m4_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next