summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2010-05-09Merge branch 'mh/status-optionally-refresh'Junio C Hamano
2010-05-09Merge branch 'cw/ws-indent-with-tab'Junio C Hamano
2010-05-09Merge branch 'cc/revert-strategy'Junio C Hamano
2010-05-09Merge branch 'jk/cached-textconv'Junio C Hamano
2010-05-09Merge branch 'pc/remove-warn'Junio C Hamano
2010-05-08cherry-pick: do not dump core when iconv failsJonathan Nieder
2010-05-04clone: quell the progress report from init and report on cloneJunio C Hamano
2010-05-02Merge branch 'maint'Junio C Hamano
2010-04-20Merge branch 'maint'Junio C Hamano
2010-04-19Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Junio C Hamano
2010-04-17tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder
2010-04-14pretty: Initialize notes if %N is usedJohannes Gilger
2010-04-10Merge branch 'maint'Junio C Hamano
2010-04-07Merge branch 'jn/mailinfo-scissors'Junio C Hamano
2010-04-06Merge branch 'sb/fmt-merge-msg'Junio C Hamano
2010-04-06Merge branch 'ef/maint-empty-commit-log'Junio C Hamano
2010-04-04whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb
2010-04-04Teach mailinfo %< as an alternative scissors markJonathan Nieder
2010-04-03Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano
2010-04-03Merge branch 'jn/merge-diff3-label'Junio C Hamano
2010-04-03Merge branch 'ef/cherry-abbrev'Junio C Hamano
2010-04-03Merge branch 'rs/threaded-grep-context'Junio C Hamano
2010-04-03git status: refresh the index if possibleMarkus Heidelberg
2010-04-02builtin/commit: remove unnecessary variable definitionMarkus Heidelberg
2010-04-02builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg
2010-04-02make commit_tree a library functionJeff King
2010-04-01revert: add "--strategy" option to choose merge strategyChristian Couder
2010-04-01merge: make function try_merge_command non staticChristian Couder
2010-04-01merge: refactor code that calls "git merge-STRATEGY"Christian Couder
2010-04-01revert: refactor merge recursive code into its own functionChristian Couder
2010-04-01revert: use strbuf to refactor the code that writes the merge messageChristian Couder
2010-03-31Sync with 1.7.0.4Junio C Hamano
2010-03-30Merge branch 'maint'Junio C Hamano
2010-03-29Merge branch 'cc/cherry-pick-ff'Junio C Hamano
2010-03-29Merge branch 'sb/notes-parse-opt'Junio C Hamano
2010-03-29Merge branch 'maint'Junio C Hamano
2010-03-28Introduce remove_or_warn functionPeter Collingbourne
2010-03-25fmt-merge-msg: hide summary optionStephen Boyd
2010-03-25fmt-merge-msg: remove custom string_list implementationStephen Boyd
2010-03-25fmt-merge-msg: use pretty.c routinesStephen Boyd
2010-03-25fmt-merge-msg: be quiet if nothing to mergeStephen Boyd
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano
2010-03-24Merge branch 'pb/log-first-parent-p-m'Junio C Hamano
2010-03-21ls: remove redundant logicErik Faye-Lund
2010-03-21cherry: support --abbrev optionErik Faye-Lund
2010-03-21cherry-pick, revert: add a label for ancestorJonathan Nieder
2010-03-21revert: clarify label on conflict hunksJonathan Nieder
2010-03-21checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21checkout --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
generated by cgit v0.10.2-6-g49f6 at 2024-04-25 14:24:42 (GMT)