repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7600 (merge): test merge from branch yet to be born
2010-08-18
Jonat
h
an Nied
e
r
t7600 (mer
g
e)
:
test
merge from branch yet to be born
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t7600 (
m
erge): check reflog
e
nt
r
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n N
i
eder
t
7
600 (merge):
d
o not lau
n
ch
gitk for --debug
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7
600 (mer
g
e): moder
n
ize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
mer
g
e: do
not mistake (ancestor of) tag for
b
ranch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jo
n
athan
Nieder
t/README: correct an
excep
t
ion when b
r
eaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than Nieder
Add a samp
l
e user f
o
r
t
h
e
svn
d
ump
library
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan N
i
eder
Document
a
tion: a
d
d submodule
.
*
to th
e
b
i
g c
o
n
fi
g
ur
a
tion
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an
N
ieder
gitmodules
.
5: url ca
n
be a
r
elati
v
e
pa
t
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
onathan Nie
d
er
git
--paginate: paginate
external comma
n
ds ag
a
in
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonatha
n
Nie
d
er
t3000 (ls-files -o):
m
odernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nieder
t9118 (
g
it-s
v
n): prevent early fa
i
lure from taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nied
e
r
t/README: d
o
cument more test h
e
lpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
revert: do not rebuild argv
on heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Nieder
tests: local
c
onfig file
s
ho
u
l
d be
h
onored
fro
m
subdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006
:
test pa
g
er c
o
nfigurat
i
on for several git
commands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Nieder
t7006
(
pager
)
: introduce
h
elper for
parameterized tes
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonath
a
n Nieder
t3508 (ch
e
rry-pick): futureproof agains
t
unmerged files
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
J
onathan Nieder
git-sv
n
: strip off l
e
adi
n
g slashes on --trunk argume
n
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nathan Nieder
add-in
t
e
r
active
:
Cl
a
rify “rema
i
n
ing hunk
s
in th
e
file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
grep: refactor grep_
o
bject
s
loop into its own
function
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Documentati
o
n/c
h
e
c
k
o
ut: cl
a
rify
description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
rebase -
i
-
p:
documen
t
sh
o
rtcomin
g
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Nieder
DWIM 'g
i
t show -5' to 'git show -
-
do-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
n
a
than
N
ieder
gitigno
r
e
.
5: Cla
r
i
f
y mat
c
hing
r
ule
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
athan Nie
d
er
rebase:
imp
r
ov
e
error message wh
e
n upstream argu
m
ent
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonat
h
an Nieder
D
o
c
ume
n
tation/chec
k
o
u
t: clar
i
fy description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fix bogu
s
com
m
it header check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan N
i
eder
Add
g
it remote set-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
J
onathan Nieder
post-rec
e
iv
e
-email: document command-
l
ine mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an
Nieder
g
i
t svn: avoi
d
uninitial
i
zed
v
ar in 'rese
t
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefile: le
t
header dependency c
h
ecker override
COMP
U
TE_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
t
h
an
N
ieder
Makefile: fix header dependency checker to al
l
ow NO_CUR
L
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
t
han
N
ieder
Documenta
t
ion/note
s
:
n
i
tp
i
cks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan
Nieder
Doc
u
m
e
ntation/
n
o
t
es: c
l
ean up des
c
ripti
o
n
o
f rewriting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Documentati
o
n
/
n
o
tes: simplif
y
treatme
n
t of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Documen
t
ation/log: add
a
C
ONFIGURATION
s
ection
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Ni
e
der
Do
c
umenta
t
ion/notes: simplify treatment of d
e
f
ault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
han
N
ied
e
r
Documentation/notes: ad
d
co
n
figur
a
tion s
e
ction
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
Docume
n
tatio
n
/notes: desc
r
ibe content of notes blobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
o
c
u
mentation/no
t
es:
d
ocumen
t
format
of notes t
r
ees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Ni
e
d
e
r
c
h
e
r
r
y-p
i
ck:
d
o not du
m
p core when
iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
pr
e
t
t
y: initia
l
ize ne
w
cmt_f
m
t
_
ma
p
t
o 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
than Ni
e
d
er
adapt
r
equest-pu
l
l tests for n
e
w pull reque
s
t
f
ormat
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
test-lib: some shells do
n
ot
let $? propaga
t
e
into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than
N
ie
d
er
shortlog
:
Document an
d
test -
-
form
a
t
o
ption
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
a
n
Nieder
t4201
(
shortlo
g
): Test output format with mu
l
tiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
h
a
n Nieder
t
4
201
(
s
h
or
t
log): guard se
t
up
w
ith t
e
st
_
exp
e
ct
_
succ
e
ss
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nat
h
an Niede
r
D
ocu
m
entati
o
n/shortlog: scripted users
s
hould not rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
ha
n
Nie
d
er
co
m
mit --ame
n
d: cope w
i
th
m
issing
d
isplay
na
m
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-li
b
: Let tests specify comma
n
ds to be run at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Nie
d
er
fsck:
check ident lines in commit objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonatha
n
Nieder
requ
e
st
-
pull: prote
c
t against
OPTI
O
NS_KEEPDASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Niede
r
tests for req
u
est-
p
ul
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Documenta
t
ion/Mak
e
file:
fix interrupt
e
d bui
l
ds of user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
J
onat
h
an Nie
d
er
fix "bun
d
le --stdin"
s
egfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Ni
e
der
t5704
(bundle): add tests for bundle
-
-stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jon
a
t
han Niede
r
t
a
g -v: use RUN_GIT_CM
D
to run
verify-ta
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Document new "
a
lready-merged" rule for
b
ranch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Add
.
depen
d
direct
o
ries to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
der
t7006: guard cleanup with test_expect_s
u
ccess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jo
n
athan Nieder
t58
0
0: testgit helper requires Python support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
N
ieder
t
740
0
: clar
i
f
y
s
ubmodule
u
pd
a
te
t
ests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
N
ieder
t7400: clarify 's
u
bmodule add' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
o
natha
n
Nieder
t7400
:
split setup into multiple t
e
sts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
athan Nieder
Teach mail
i
n
fo %<
a
s an alternative
s
cissors mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nie
d
er
Makefile: future-proof Cygwin
v
ersion check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nie
d
er
merge
-
recursive: add
a la
b
el for
ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
ch
e
rry-pick, revert: add
a label
f
or ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
ied
e
r
rev
e
rt: clar
i
fy labe
l
on
c
onflic
t
h
u
n
k
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
Nieder
compat: add m
e
mp
c
py()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout -m --
c
onfli
c
t=diff3: add
a label
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nieder
m
erge_trees(): add ancestor label parameter
for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nie
d
er
merge_file(): add comment explaining behav
i
or wrt co
n
fl
i
ct
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
iede
r
checkout --c
o
n
f
lict=diff3: add a label
f
or a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
ll_me
r
ge(
)
: add anc
e
stor
l
a
be
l
parame
t
er
for
d
iff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nied
e
r
merg
e
-
file --diff
3
:
add a
label f
o
r
ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nie
d
e
r
xdl_merge(): mo
v
e file1 and file2 labe
l
s to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
xdl_me
r
g
e
(): add optional an
c
es
t
or labe
l
t
o
d
iff3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
tests:
document cherry-pick behav
i
or in
face of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
i
eder
t
ests: document f
o
r
m
at of c
o
n
f
l
i
c
t
s
f
r
om
c
he
c
k
out -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nie
d
e
r
r
e
v
e
rt
:
fix tiny memory leak
i
n cherry-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
Makefile
:
Fix occasional GIT-CFLAGS breaka
g
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nied
e
r
Makefile: Fix CD
P
ATH problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Nieder
gitk: Don'
t
clobber "Remember this view"
setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
atha
n
Nieder
gitk: Add com
m
ents to explain e
n
code_view_opts and
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonatha
n
Nieder
Makefile
:
cl
a
rify definition
o
f TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am: remove r
e
base-apply directory before gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
J
on
a
than Ni
e
der
tests: Fix
race conditio
n
i
n t7006-pa
g
er
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jon
a
tha
n
Nie
d
er
t7006-pag
e
r: if st
d
out is not a termina
l
, mak
e
a new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan
N
i
eder
tests: A
d
d
t
ests for
a
u
tomatic use of p
a
ger
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
a
than Nieder
a
m
: Fix
l
aunching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
onathan Nied
e
r
g
i
t svn: Fi
x
launchin
g
o
f
pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
N
i
e
der
g
i
t
.
1: Clarify the behavior of th
e
--pag
i
nate
option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
M
a
ke 'git
v
ar G
I
T_PAGER'
alway
s
print the configured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
na
t
h
a
n
Nie
d
e
r
Fix 'gi
t
var'
u
s
age synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
i
e
de
r
Makefile: always
r
em
o
ve
.
depe
n
d director
i
es o
n
'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Niede
r
M
akef
i
le: tuck away g
e
nerated mak
e
fil
e
fragments in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
onathan
N
i
e
de
r
Do not i
n
stall shell lib
r
arie
s
executable
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nieder
Teach Makefile to check head
e
r
dependenci
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next