aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
* git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-17
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-17
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17
* builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-17
* notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-17
* notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-09
* Allow "check-ref-format --branch" from subdirectoryJonathan Nieder2010-08-06
* check-ref-format: handle subcommands in separate functionsJonathan Nieder2010-08-06
* commit: remove full stop from usage help for -uStephen Boyd2010-07-27
* Clarify help message when no remote is specified in fetch/pull.Matthieu Moy2010-07-27
* Cast execl*() NULL sentinels to (char *)Thomas Rast2010-07-25
* Merge branch 'jl/add-n-ignore-missing'Junio C Hamano2010-07-19
|\
| * git add: Add the "--ignore-missing" option for the dry runJens Lehmann2010-07-12
* | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-16
* | Merge branch 'wp/merge-tree-fix'Junio C Hamano2010-07-15
|\ \
| * | merge-tree: fix where two branches share no changesWill Palmer2010-07-14
* | | Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-15
|\ \ \
| * | | MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-14
| |/ /
* | | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-15
* | | Merge branch 'jn/grep-open'Junio C Hamano2010-07-15
|\ \ \
| * | | grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy2010-07-07
* | | | Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano2010-07-15
|\ \ \ \
| * | | | do not write out index when status does not have toJunio C Hamano2010-07-06
* | | | | Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano2010-07-08
| |_|_|/ |/| | |
* | | | Merge branch 'maint'Junio C Hamano2010-07-07
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2010-07-07
| * | | Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2010-07-07
| |/ /
* | | Merge branch 'ar/decorate-color'Junio C Hamano2010-06-30
|\ \ \
| * | | Allow customizable commit decorations colorsNazri Ramliy2010-06-24
* | | | Merge branch 'cc/cherry-pick-stdin'Junio C Hamano2010-06-30
|\ \ \ \
| * | | | revert: do not rebuild argv on heapJonathan Nieder2010-06-29
| * | | | revert: accept arbitrary rev-list optionsChristian Couder2010-06-25
* | | | | Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-30
|\ \ \ \ \
| * | | | | Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-25
* | | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-06-30
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips2010-06-27
| |\ \ \ \ \
| * | | | | | grep -O: allow optional argument specifying the pager (or editor)Johannes Schindelin2010-06-13
| * | | | | | grep: Add the option '--open-files-in-pager'Johannes Schindelin2010-06-13
| * | | | | | Unify code paths of threaded grepsJohannes Schindelin2010-06-13
| * | | | | | grep: refactor grep_objects loop into its own functionJonathan Nieder2010-06-13
* | | | | | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-30
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-27