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
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
2010-09-10
Elijah Newren
merge-re
c
u
rsive: D
/
F con
f
licts where was_a_dir/file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ija
h
Newren
t
3
5
0
9:
Ad
d
renam
e
+ D/F conf
l
ict tes
t
case that recurs
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-08
Jun
i
o C Hamano
Merg
e
b
ra
n
ch 'tf/
c
leanup-b
u
ilt
i
n-help-headers
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Ham
a
no
M
e
r
g
e
b
r
a
nch
'jk
/
t
est-must-fail-missing'
commit
|
commitdiff
|
tree
2010-09-08
Ju
n
io
C
Hama
n
o
Merge branch
'
jh/error-r
e
moving-missing-no
t
e'
commit
|
commitdiff
|
tree
2010-09-08
Juni
o
C Ha
m
ano
Merge bra
n
ch '
k
f/askpass-confi
g
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
M
e
rge branch 'b
c
/maint-fetc
h
-url-only'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch
'jk/ma
i
nt-pass-
c
-con
f
ig-in-
e
nv'
commit
|
commitdiff
|
tree
2010-09-08
J
u
ni
o
C Ha
m
ano
Merge
branch 'en/d
-
f-conflict-fix
'
commit
|
commitdiff
|
tree
2010-09-08
J
o
h
annes Sixt
fast
-
e
x
port: ensure
t
h
at
a
renamed file
is p
r
inted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-07
Elij
a
h Ne
w
ren
revert: Fix trivi
a
l comment st
y
le issue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
E
l
ijah Newren
cache_tr
e
e_free: Fix small memory
l
eak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Haman
o
Merg
e
branch 'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-09-06
Thiago Farina
builtin/cle
a
n
.
c:
Use ST
R
ING_LIST_IN
I
T_NODUP
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
J
ens Lehmann
t3404 & t7508
:
cd in
s
ide subshell
in
s
tead of aro
u
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
J
u
nio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Haman
o
Merge branc
h
'
x
x/trivial' into
m
aint
commit
|
commitdiff
|
tree
2010-09-06
Juni
o
C
Hamano
tag
.
c: whitespac
e
br
e
ak
a
g
es fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
J
a
red H
a
nce
Fix
whites
p
ace
iss
u
e
in object
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
J
e
n
s Lehman
n
t5505: add m
i
s
si
n
g &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-04
Junio C
Hamano
Mer
g
e b
r
an
c
h
'
jl/
s
ubmodule-ig
n
ore-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Ha
m
ano
Merge branch 'ab/test-
2
'
commit
|
commitdiff
|
tree
2010-09-04
J
u
ni
o
C H
a
mano
Merge
br
a
nc
h
'js/deta
c
h
ed-stash'
commit
|
commitdiff
|
tree
2010-09-04
Junio
C
Hamano
Merge branch 'j
s
/maint-reflog-b
e
yond-hor
i
zon'
commit
|
commitdiff
|
tree
2010-09-04
Junio C
H
a
ma
n
o
Merge branch 'dg/lo
c
al-m
o
d-e
r
ror-
m
essages'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C
Ham
a
no
Merge bra
n
ch
'nd/mai
n
t-fix-replace'
commit
|
commitdiff
|
tree
2010-09-04
Nguyễ
n
T
h
á
i
Ngọc Duy
parse_obj
e
ct:
p
a
ss
o
n
the
o
riginal sha
1
, not the
repl
a
ced one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ham
a
no
Mer
g
e branc
h
'ab/
c
ompat-
r
egex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Hamano
Merge branch 'nd/clone-de
p
th-
z
ero'
commit
|
commitdiff
|
tree
2010-09-03
J
u
n
io C
H
aman
o
Merge br
a
n
ch '
j
n/maint-doc-us
e
r-ma
n
ual
-
h
t
ml-doct
y
pe'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C
Hamano
Me
r
ge branc
h
'cb/ma
i
nt-mer
g
etool-no
-
tty'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Hamano
Me
r
ge branch
'jn/apply-filename-with-s
p
'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C
Hamano
Merge bra
n
ch 'j
n
/merge-cus
t
om-no-trivial'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hama
n
o
Merge bra
n
ch 'jc/maint-do
c
-
em-dash
'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C
Hama
n
o
Merge branch
'mg
/
doc-bundle'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Hama
n
o
M
e
rge branch 'jn/do
c
-b
a
ckslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge bra
n
ch 'jn/
u
pda
t
e
-
contri
b
-
example-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merg
e
branch 'jn/m
e
rge-renormal
i
ze'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio
C Hamano
Sync
w
ith 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
H
amano
Git
1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Thiago Farin
a
builtin/merge_re
c
ursive
.
c: A
d
d an usag
e
s
t
r
ing
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Je
n
s Lehmann
t7406 &
t
7407: add mis
s
ing &&
a
t
end of lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7405: cd
i
nside
subsh
e
ll instead of
around
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
t7609-mer
g
e-co-error
-
msgs: te
s
t
non-f
a
st forward case
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matth
i
eu Moy
Move "show_
a
ll_
e
rr
o
r
s = 1" to setup_unpack_trees_porcelain()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matthie
u
Moy
set
u
p_unpack_t
r
ees_porcelain: ta
k
e
t
he whole options
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Ma
t
thie
u
Moy
Move set_porcelain_error_msgs to
unpack-tr
e
es
.
c and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
Prepare for
1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C Hamano
Merge b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
P
r
e
p
are for 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
J
unio C
Hamano
Me
r
g
e br
a
nch 'gp/pack-refs-remove-empty-dirs' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
n
io C
H
amano
Merge branch 'sg/re
r
e
re
-
gc
-
old-
s
till-used' int
o
maint
commit
|
commitdiff
|
tree
2010-09-01
Junio
C Ham
a
no
M
erge
b
ranch 'n
p
/maint-
h
uge-delta-g
e
neration' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
no
Merg
e
branc
h
'dj/fetc
h
-tagopt' into mai
n
t
commit
|
commitdiff
|
tree
2010-09-01
J
uni
o
C H
a
mano
M
e
r
ge
br
a
nch '
d
a/fix-submodule-syn
c
-superproject-c
o
nfig
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
m
ano
Merge b
r
anch 'en/rebase-a
g
a
i
nst-reb
a
se-fix' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio
C Ha
m
ano
i
n
stall
-
webd
o
c: fi
l
ter timestamp-only chan
g
es correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Thiago Farina
b
uiltin
.
h
:
Move two functions definitions to help
.
h
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o
C Ha
m
ano
Mer
g
e
b
ranch 'np/maint-huge-d
e
lt
a
-generation
'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o C Hamano
M
e
r
ge
bra
n
ch 'da/fix
-
su
b
module-s
y
n
c
-
s
uperp
r
oject-config'
commit
|
commitdiff
|
tree
2010-08-31
J
un
i
o C Haman
o
M
e
rg
e
b
r
anch 'jn/ch
e
rry
-
revert-messa
g
e-
c
l
ean-up'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
mano
Me
r
ge branch '
c
b/binar
y
-patch-id'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Ha
m
an
o
Me
r
ge branch '
a
b/ma
i
n
t
-reset-mixe
d
-w-pathsp
e
c-a
d
vi
c
e'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Mer
g
e branch 'dj/fetch-tagopt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rge bra
n
ch
'
en/d-f-
c
onf
l
ict-fix'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o
C Ham
a
no
Merg
e
branch 'jn/
s
vn-fe'
commit
|
commitdiff
|
tree
2010-08-31
J
u
n
i
o C H
a
ma
n
o
Merge
bra
n
ch 'tr/maint-
n
o-unquot
e
-plus'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Ha
m
a
n
o
Mer
g
e
branch 'jn/pagina
t
e-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hama
n
o
Merge
branc
h
'
jn/maint-setu
p
-fix'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o
C
H
amano
M
e
rge
b
ranch 'en/fast-export-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Mer
g
e branch 'hv/a
u
tosquash-config'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o C Hamano
Merge branch '
s
g/rerere-gc
-
old
-
stil
l
-used'
commit
|
commitdiff
|
tree
2010-08-31
M
a
tthieu Mo
y
tests: factor HOME=$(pw
d
) in test
-
l
ib
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfj
ö
rð Bjarmason
t
es
t
-lib: use sub
s
hell in
s
te
a
d
of
cd
$
n
e
w &&
.
.
&&
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan
N
iede
r
test
s
: simplify "m
i
ssing PREREQ" message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfj
ö
rð Bj
a
rmason
t/t00
0
0-basic
.
s
h
: Run the p
a
ssing TODO t
e
s
t
i
n
side
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Æva
r
Arnfjörð
Bjarmason
test-lib: Allo
w
ov
e
rriding of
TEST_DIRECT
O
R
Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Æva
r
Arnfjörð Bjarma
s
on
test-lib: Use "
$
GIT_BUILD_
D
IR" inst
e
ad of "$TEST_DIR
E
CTORY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjörð Bjarmaso
n
t
est-lib: Use $T
E
ST_DIRECTORY or $GIT_BUILD_DIR instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Thoma
s
Rast
test: Introduce $GIT_B
U
ILD_DIR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jonath
a
n Nied
e
r
tests:
m
ake test_mi
g
ht_fail fa
i
l on mi
s
s
i
n
g
commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Nieder
tests
:
make test_might
_
fail more verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an Herl
a
nd
n
o
tes: Don'
t
c
r
e
ate (empty)
c
ommit when rem
o
v
i
ng
n
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Knut
F
ranke
Extend documentation of core
.
ask
p
a
s
s an
d
GIT_ASKPASS
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Knut Franke
Allow c
o
re
.
askpass to override SS
H
_ASKPASS
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Anselm Kr
u
is
Add
a new option 'cor
e
.
askp
a
ss'
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jef
f
Ki
n
g
te
s
t
s: make test_must_fail fa
i
l
on missing commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
t
e
sts: make test_must_
f
ai
l
more v
e
rbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Anders
Kaseorg
gitweb: Don't die_error in git_tag after already printing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jon Seymour
t3
9
03: fix broke
n
test_must_fail cal
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jon Seymour
t1503
:
fix broken test_must
_
fa
i
l c
a
lls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
che
c
kout: Us
e
su
b
module
.
*
.
i
gno
r
e setting
s
from
.
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
J
ens Lehmann
checkout: Add test for diff
.
i
g
n
oreSubmodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
J
u
n
i
o
C Hamano
Merge b
r
anch '
m
a
int'
commit
|
commitdiff
|
tree
2010-08-30
J
u
nio C
H
amano
Merge branch 'maint-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-08-30
Thiago
F
ari
n
a
object
.
h: A
d
d OB
J
ECT_ARRAY
_
INIT macro and make use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
M
atthieu Moy
t0003: add missi
n
g &
&
a
t end
o
f lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Junio
C
H
a
m
a
no
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-08-26
Jay Soffian
f
o
r-each-ref: f
i
x ob
j
ectname:short bu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next