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
mergetool: don't skip modify/remove conflicts
2011-02-16
Martin
von Zwe
i
g
b
ergk
mergeto
o
l: don't s
k
ip modify/remove con
f
l
icts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-16
Martin v
o
n Zwei
g
be
r
g
k
r
e
rere "remaining"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-05
J
unio C Hamano
Git 1
.
7
.
4
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-05
Juni
o
C
Hamano
Merge bra
n
ch 'maint' to sync w
i
th 1
.
7
.
3
.
5
commit
|
commitdiff
|
tree
2011-01-05
Junio C Ham
a
no
Git 1
.
7
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-05
Junio C Hamano
Merge branch 'jn
/
svn-
f
e
'
(
e
arly part)
commit
|
commitdiff
|
tree
2011-01-05
Junio C Ha
m
a
n
o
M
e
rge
b
r
a
nch
'ao/t9001-
f
ix
'
commit
|
commitdiff
|
tree
2011-01-05
Ju
n
io C Hamano
Mer
g
e bra
n
ch 'pw/
c
o
n
v
e
rt-p
a
thname-s
u
bstitu
t
ion'
commit
|
commitdiff
|
tree
2011-01-05
Juni
o
C Hamano
Merge branch 'mg/cvsimport'
commit
|
commitdiff
|
tree
2011-01-04
Antonio Ospite
t/t90
0
1-send-email
.
sh: fix
'&&' chain in some
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
Michael J Gruber
c
vs
i
mport: handle the par
s
in
g
of uppercase config
options
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
J
unio C Haman
o
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-01-04
Jonathan Nieder
daemon: suppor
t
<
d
i
r
ectory> argumen
t
s again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
Ralf W
i
ldenh
u
e
s
Fix typos i
n
the doc
u
men
t
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
Jonathan Nieder
gitweb: skip logo in at
o
m feed
w
hen
there is
n
one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-29
R
obi
n
H
.
Johnso
n
t
9
0
01: Fix t
e
s
t
p
rerequisites
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Ham
a
no
Git 1
.
7
.
4-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
J
u
nio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-12-28
Junio
C
Ha
m
a
n
o
Prepare for 1
.
7
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
i
o
C Ha
m
ano
Me
r
ge branch 'jk/commit-die
-
o
n
-bog
u
s-i
d
ent' into maint
commit
|
commitdiff
|
tree
2010-12-28
Junio
C
Hamano
Merge branch '
k
s/
b
l
a
me-workt
r
ee-
t
extconv-cached' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Junio
C H
a
mano
Merge branch 'jc
/
maint-rebas
e
-rewrite
-
last-skip' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Junio C Ham
a
no
Merge branch 'jc/maint-am-a
b
ort-safely' into main
t
commit
|
commitdiff
|
tree
2010-12-28
J
unio
C
Hamano
Me
r
ge
b
ranch 'kb/maint
-
s
tatu
s
-cquote' in
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2010-12-28
Bra
n
d
on Casey
t9001: use olde
r
G
e
t
o
p
t::
L
ong
b
oolean prefix '-
-
no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
J
u
nio
C Hamano
M
e
r
ge
b
ranch 'jc/maint-rebase-re
w
r
ite
-
l
ast-skip'
commit
|
commitdiff
|
tree
2010-12-28
Junio C Hamano
M
erge branch 'n
d
/
setup'
commit
|
commitdiff
|
tree
2010-12-28
Robin H
.
Johnson
Fix false positives
i
n
t
3404 due to SHELL=/bin/false
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-27
N
gu
y
ễn Thái Ngọc Duy
s
etu
p
_work_tree: ad
j
ust relative $GIT_WORK_TREE after
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-26
Junio C H
a
mano
M
erge bran
c
h
'rs/maint-diff-fd-leak' i
n
to
maint
commit
|
commitdiff
|
tree
2010-12-26
René Scha
r
fe
clos
e
file on error
in read_mmfile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-23
J
uni
o
C Hamano
Merge
branc
h
'rj
/
maint-difftool-cygwin-
w
or
k
arou
n
d
'
commit
|
commitdiff
|
tree
2010-12-23
Junio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-12-23
B
randon Casey
Makefile
:
add NO_FNMATCH
_
CASEFOLD to IRIX
s
ections
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-23
Brandon
Case
y
test-lib
.
sh/test_decode_c
o
lor
(
):
u
se octal
n
ot hex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-23
J
u
n
i
o C Hamano
rebase
-
-skip
:
c
o
r
re
c
tly wrap-up when
skipping the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
J
u
ni
o
C Hamano
t0021: av
o
id g
e
tt
i
ng filter kille
d
with SIGPIP
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Ju
n
io C Hamano
Me
r
ge bran
c
h 'rj/main
t
-
tes
t
-fixes'
commit
|
commitdiff
|
tree
2010-12-22
Junio C Haman
o
Merge branch 'jc
/
main
t
-am-abort-s
a
fely'
commit
|
commitdiff
|
tree
2010-12-22
J
u
n
i
o
C
H
a
mano
Merge branch 'jk/comm
i
t-die-on-bogus-i
d
ent'
commit
|
commitdiff
|
tree
2010-12-22
Junio C Ha
m
ano
Merge branch '
p
d/bash-4
-
completi
o
n'
commit
|
commitdiff
|
tree
2010-12-22
Jun
i
o
C
Ham
a
no
Merge branch '
n
d/mai
n
t
-fix-add-ty
p
o-d
e
t
e
c
tion'
commit
|
commitdiff
|
tree
2010-12-22
J
unio C Ha
m
ano
Merge branch 'tf/commit
-
lis
t
-prefix
'
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn
T
hái
N
gọc Duy
git
.
txt: correct
w
here --work-tree
p
ath is relat
i
ve
to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái
N
gọc Duy
Reve
r
t
"
D
o
c
u
menta
t
ion: always respe
c
t
core
.
worktre
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Jon
a
t
h
an Nieder
t0001: test git i
n
it when run via a
n
alias
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc D
u
y
Remove
a
ll log
i
c from get_git
_
work_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc Duy
s
e
tup: rework setup_ex
p
licit_git_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Ngu
y
ễn Thái Ng
ọ
c
D
uy
setup: clean up set
u
p_disc
o
vered
_
git
_
dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Michael J Gruber
t1020-
s
ubd
i
re
c
tory: test a
l
ias
e
xp
a
nsi
o
n in
a
subdirect
o
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc Duy
setup: cl
e
an up s
e
tup_bare_git
_
dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thá
i
Ngọc
D
uy
setup: limit get_git_work_tr
e
e(
)
's to explicit set
u
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái N
g
ọc
D
u
y
Use git_config_early()
instead
o
f git_config() during
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễ
n
Thái Ngọ
c
Duy
Add gi
t
_co
n
f
ig_
e
arly()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Pete
Wy
c
koff
convert
filt
e
r
: supp
l
y path
t
o
external d
r
iver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Merge branch
'ks/blame-worktr
e
e-textconv-cached'
commit
|
commitdiff
|
tree
2010-12-21
Ju
n
io C
Hamano
Mer
g
e branc
h
'jk/t2107-now
-
p
a
s
s
es'
commit
|
commitdiff
|
tree
2010-12-21
Junio C
H
amano
M
e
rge branch 'jk/maint
-
decorate
-
01-bool'
commit
|
commitdiff
|
tree
2010-12-21
Junio C
H
amano
Merge bra
n
ch 't
c
/completion-reflog'
commit
|
commitdiff
|
tree
2010-12-21
J
unio C Hamano
Merge branch '
n
d/oneli
n
e-
s
ha1-name-
f
r
o
m
-specific-ref'
commit
|
commitdiff
|
tree
2010-12-21
Juni
o
C
H
aman
o
M
e
rge branch 'jn/main
t
-gitweb-pathinf
o
-fix'
commit
|
commitdiff
|
tree
2010-12-21
Jonathan Nieder
t
0050: fix printf format strings for
p
ortability
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Ra
m
say Jone
s
t34
1
9-
*
.
sh: Fix arithmetic
expa
n
sion syntax error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
J
u
nio
C
Hamano
am -
-
abort: keep unrelated
commit
s
s
i
nce the l
a
st fai
l
u
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hama
n
o
set_try_to_fr
e
e_routin
e
(NULL)
mea
n
s
"d
o
not
h
ing special"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Junio C
Hamano
commit: die
b
e
f
ore ask
i
ng to edit the log message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zwei
g
bergk
completi
o
n: add
mi
s
sing configur
a
tion variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident: die
o
n
bogus date fo
r
ma
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
K
irill Smel
k
ov
fill_te
x
tcon
v
(
)
: Don't get/put cache if
sha1 is
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Kiri
l
l Smelkov
t/t8006: Demonstrat
e
blame i
s
brok
e
n
when
c
ache
t
extconv
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Junio C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-12-19
Jo
n
at
h
an
N
i
eder
t
9300: u
s
e
p
erl
"
head -c"
c
l
one
i
n
pla
c
e of "dd bs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Je
f
f King
t2107: m
a
r
k
passing test as success
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Jef
f
K
i
ng
handle arbitrary i
n
ts in git_
c
onfig_maybe_bool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Thiago
F
a
rina
builtin/rm
.
c: Us
e
ALLOC_GROW instea
d
of alloc
_
nr and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Thia
g
o Farina
builtin/bra
n
ch
.
c: Use A
L
LOC_
G
ROW
i
nstead of a
l
lo
c
_nr
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Jakub Narebski
gitweb: Include
links to
fee
d
s in HTML
h
eader only
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
M
ark Lodato
fsck docs: remove outdated and u
s
eless diagnos
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
T
h
omas
R
ast
userdiff
:
fix typo in
r
uby and python word regexe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Vasyl' Vavrychuk
trace
.
c:
mark fil
e
-lo
c
al fu
n
ction
stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Tay
R
a
y Chuan
bash completion: add ba
s
ic support for git-reflog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Jiang Xin
Fix t
y
po in
g
i
t
-
gc document
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Junio
C
H
a
man
o
Update d
r
aft rele
a
s
e
notes to
1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Junio C Hamano
M
e
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-12-16
Nguyễn Thái N
g
ọc Duy
get_s
h
a
1: hand
l
e
spec
i
al case
$co
m
mit^{
/
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-16
M
i
ch
a
el J Gruber
difftool: provide basename to extern
a
l tools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-16
Michael J Gru
b
er
git-diffto
o
l
.
txt
:
correct the des
c
r
iption of $BASE
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-16
Junio C Haman
o
Merge bran
c
h '
k
b
/
dif
f
-C-M-synonym'
commit
|
commitdiff
|
tree
2010-12-16
J
unio C Hamano
Merg
e
branch
'
j
n
/fast-impo
r
t
-
blob-access'
commit
|
commitdiff
|
tree
2010-12-16
Ju
n
io
C
Hamano
Merge b
r
anch
'
jl/fetch-submodule-recur
s
ive'
commit
|
commitdiff
|
tree
2010-12-16
J
u
nio C Hamano
M
e
r
ge bran
c
h 'rj/msvc-fix'
commit
|
commitdiff
|
tree
2010-12-16
J
unio C Ham
a
no
M
e
r
ge branch 'nd
/
extend
e
d-sha1
-
r
elpat
h
'
commit
|
commitdiff
|
tree
2010-12-16
Juni
o
C Hamano
Merge b
r
anc
h
'aa/
s
tatus-
h
ilite-br
a
nch'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge b
r
anch 'ak/describe-exac
t
'
commit
|
commitdiff
|
tree
2010-12-16
Junio
C
Hamano
Merg
e
br
a
nch 'nd/mai
n
t-rela
t
ive'
commit
|
commitdiff
|
tree
2010-12-16
Ju
n
i
o
C Hamano
Mer
g
e branch 'jn/main
t
-
s
vn-fe'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Haman
o
Merge bra
n
ch
'jc/mai
n
t-svn-info-test-fix'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge
b
ranch 'jn
/
s
u
bmo
d
ule-b
-
c
urrent
'
commit
|
commitdiff
|
tree
2010-12-16
J
u
nio
C
Hamano
Merge br
a
nch 'jn/maint-
f
ast-import-objec
t
-reuse'
commit
|
commitdiff
|
tree
next